From 8dd3e98e3dcb1ae101f5a8e4417ea5b63aa196c5 Mon Sep 17 00:00:00 2001 From: Adam Kewley Date: Tue, 18 Jun 2024 12:49:22 +0200 Subject: [PATCH] Reformat west-const the remainder of src/OpenSimCreator --- .../ComponentRegistry/ComponentRegistry.h | 8 +- .../ComponentRegistryEntry.h | 6 +- .../StaticComponentRegistries.cpp | 56 +++++------ .../StaticComponentRegistries.h | 6 +- .../ICustomDecorationGenerator.h | 4 +- .../CustomComponents/InMemoryMesh.cpp | 2 +- .../Documents/CustomComponents/InMemoryMesh.h | 2 +- .../FrameDefinitionActions.cpp | 8 +- .../FrameDefinition/FrameDefinitionActions.h | 8 +- .../Documents/Landmarks/LandmarkHelpers.cpp | 12 +-- .../Documents/Landmarks/LandmarkHelpers.h | 6 +- .../Documents/MeshImporter/Document.h | 14 +-- .../MeshImporter/MIObjectHelpers.cpp | 2 +- .../Documents/MeshImporter/MIObjectHelpers.h | 2 +- .../Documents/MeshImporter/Mesh.cpp | 3 +- .../Documents/MeshImporter/OpenSimBridge.cpp | 2 +- .../MeshImporter/UndoableActions.cpp | 2 +- .../Documents/MeshImporter/UndoableActions.h | 2 +- .../MeshWarper/TPSDocumentHelpers.cpp | 4 +- .../Documents/MeshWarper/TPSDocumentHelpers.h | 2 +- .../MeshWarper/UndoableTPSDocumentActions.cpp | 14 +-- .../MeshWarper/UndoableTPSDocumentActions.h | 2 +- .../Documents/Model/IConstModelStatePair.h | 4 +- .../Documents/Model/ObjectPropertyEdit.h | 2 +- .../Documents/Model/UndoableModelActions.cpp | 26 ++--- .../Documents/Model/UndoableModelActions.h | 12 +-- .../TPSLandmarkPairWarperFactory.cpp | 4 +- .../ComponentOutputSubfield.cpp | 22 ++--- .../OutputExtractors/IOutputExtractor.cpp | 4 +- .../OutputExtractors/IOutputExtractor.h | 4 +- .../IntegratorOutputExtractor.cpp | 6 +- .../MultiBodySystemOutputExtractor.cpp | 4 +- .../OutputExtractors/OutputExtractor.h | 4 +- .../Simulation/ForwardDynamicSimulation.cpp | 2 - .../Simulation/ForwardDynamicSimulator.cpp | 2 +- .../ForwardDynamicSimulatorParams.cpp | 2 - .../Documents/Simulation/SimulationReport.cpp | 2 - .../Documents/Simulation/SimulationStatus.cpp | 2 - .../Simulation/SingleStateSimulation.cpp | 5 +- .../Simulation/StoFileSimulation.cpp | 10 +- .../Graphics/CachedModelRenderer.cpp | 9 +- .../Graphics/CachedModelRenderer.h | 2 +- .../ComponentSceneDecorationFlagsTagger.cpp | 3 +- .../Graphics/CustomRenderingOptions.cpp | 4 +- .../Graphics/CustomRenderingOptions.h | 4 +- .../Graphics/ModelRendererParams.cpp | 2 +- .../Graphics/OpenSimDecorationGenerator.cpp | 26 +++-- .../Graphics/OpenSimDecorationGenerator.h | 4 +- .../Graphics/OpenSimDecorationOptions.cpp | 7 +- .../Graphics/OpenSimDecorationOptions.h | 4 +- .../Graphics/OpenSimGraphicsHelpers.cpp | 4 +- .../Graphics/OpenSimGraphicsHelpers.h | 2 +- .../Graphics/OverlayDecorationGenerator.cpp | 2 +- .../Graphics/OverlayDecorationGenerator.h | 2 +- .../Graphics/OverlayDecorationOptionFlags.cpp | 10 +- .../Graphics/OverlayDecorationOptionFlags.h | 10 +- .../Graphics/OverlayDecorationOptions.cpp | 24 ++--- .../Graphics/OverlayDecorationOptions.h | 4 +- .../Graphics/SimTKDecorationGenerator.cpp | 6 +- .../Graphics/SimTKDecorationGenerator.h | 2 +- .../UI/Experimental/MeshHittestTab.cpp | 6 +- .../UI/Experimental/MeshHittestTab.h | 2 +- .../PreviewExperimentalDataTab.cpp | 19 ++-- .../Experimental/PreviewExperimentalDataTab.h | 2 +- .../RendererGeometryShaderTab.cpp | 8 +- .../Experimental/RendererGeometryShaderTab.h | 2 +- .../UI/Experimental/TPS2DTab.cpp | 8 +- src/OpenSimCreator/UI/Experimental/TPS2DTab.h | 2 +- .../UI/FrameDefinition/FrameDefinitionTab.cpp | 94 +++++++++---------- .../UI/FrameDefinition/FrameDefinitionTab.h | 2 +- .../FrameDefinitionTabToolbar.cpp | 3 +- .../FrameDefinitionUIHelpers.cpp | 4 +- .../FrameDefinitionUIHelpers.h | 2 +- src/OpenSimCreator/UI/LoadingTab.cpp | 2 - .../UI/MeshImporter/MeshImporterSharedState.h | 14 +-- .../UI/MeshImporter/MeshImporterTab.cpp | 36 +++---- .../UI/MeshImporter/MeshImporterTab.h | 4 +- .../UI/MeshWarper/MeshWarpingTab.cpp | 10 +- .../UI/MeshWarper/MeshWarpingTab.h | 2 +- .../MeshWarpingTabDecorationGenerators.h | 2 +- .../UI/MeshWarper/MeshWarpingTabFileMenu.h | 3 +- .../UI/MeshWarper/MeshWarpingTabHover.h | 3 +- .../MeshWarper/MeshWarpingTabInputMeshPanel.h | 44 ++++----- .../UI/MeshWarper/MeshWarpingTabMainMenu.h | 4 +- .../MeshWarpingTabResultMeshPanel.h | 4 +- .../MeshWarper/MeshWarpingTabUserSelection.h | 2 +- .../UI/ModelEditor/AddBodyPopup.cpp | 5 +- .../UI/ModelEditor/AddComponentPopup.cpp | 6 +- .../UI/ModelEditor/ComponentContextMenu.cpp | 20 ++-- .../UI/ModelEditor/ComponentContextMenu.h | 2 +- .../UI/ModelEditor/CoordinateEditorPanel.cpp | 16 +--- .../UI/ModelEditor/CoordinateEditorPanel.h | 2 +- .../UI/ModelEditor/EditorTabStatusBar.cpp | 17 ++-- .../UI/ModelEditor/EditorTabStatusBar.h | 2 +- .../UI/ModelEditor/ExportPointsPopup.cpp | 38 ++++---- .../UI/ModelEditor/ModelEditorMainMenu.cpp | 13 +-- .../UI/ModelEditor/ModelEditorMainMenu.h | 2 +- .../UI/ModelEditor/ModelEditorTab.cpp | 10 +- .../UI/ModelEditor/ModelEditorTab.h | 2 +- .../UI/ModelEditor/ModelEditorToolbar.cpp | 9 +- .../UI/ModelEditor/ModelEditorToolbar.h | 2 +- .../UI/ModelEditor/ModelMusclePlotPanel.cpp | 26 ++--- .../UI/ModelEditor/OutputWatchesPanel.cpp | 13 +-- .../UI/ModelEditor/OutputWatchesPanel.h | 2 +- .../UI/ModelEditor/ReassignSocketPopup.cpp | 2 +- .../UI/ModelEditor/Select1PFPopup.cpp | 6 +- .../UI/ModelEditor/SelectComponentPopup.cpp | 7 +- .../UI/ModelEditor/SelectGeometryPopup.cpp | 6 +- .../UI/ModelWarper/ChecklistPanel.cpp | 12 +-- .../UI/ModelWarper/ModelWarperTab.cpp | 7 +- .../UI/ModelWarper/ModelWarperTab.h | 2 +- src/OpenSimCreator/UI/ModelWarper/UIState.h | 2 +- src/OpenSimCreator/UI/Shared/BasicWidgets.cpp | 30 +++--- src/OpenSimCreator/UI/Shared/BasicWidgets.h | 22 ++--- .../UI/Shared/ChooseComponentsEditorLayer.cpp | 2 +- .../ChooseComponentsEditorLayerParameters.h | 2 +- .../UI/Shared/GeometryPathEditorPopup.cpp | 7 +- src/OpenSimCreator/UI/Shared/MainMenu.cpp | 2 +- src/OpenSimCreator/UI/Shared/MainMenu.h | 2 +- .../Shared/ModelEditorViewerPanelParameters.h | 5 +- .../ModelEditorViewerPanelRightClickEvent.h | 3 +- .../UI/Shared/ModelEditorViewerPanelState.cpp | 3 +- .../UI/Shared/ModelSelectionGizmo.cpp | 6 +- .../UI/Shared/NavigatorPanel.cpp | 42 +++++---- .../UI/Shared/ObjectPropertiesEditor.cpp | 6 +- .../UI/Shared/Readonly3DModelViewer.cpp | 5 +- .../Simulation/ModelStatePairContextMenu.cpp | 4 +- .../UI/Simulation/SimulationViewerPanel.cpp | 2 - src/OpenSimCreator/Utils/OpenSimHelpers.h | 4 +- src/OpenSimCreator/Utils/ParamBlock.cpp | 2 - src/OpenSimCreator/Utils/ShapeFitters.cpp | 2 +- src/OpenSimCreator/Utils/SimTKHelpers.cpp | 2 - 132 files changed, 476 insertions(+), 607 deletions(-) diff --git a/src/OpenSimCreator/ComponentRegistry/ComponentRegistry.h b/src/OpenSimCreator/ComponentRegistry/ComponentRegistry.h index abda52bd3..af6741791 100644 --- a/src/OpenSimCreator/ComponentRegistry/ComponentRegistry.h +++ b/src/OpenSimCreator/ComponentRegistry/ComponentRegistry.h @@ -45,7 +45,7 @@ namespace osc ComponentRegistryEntry& emplace_back( std::string_view name, std::string_view description, - std::shared_ptr prototype) + std::shared_ptr prototype) { auto& erased = push_back_erased(ComponentRegistryEntry { @@ -58,7 +58,7 @@ namespace osc }; template - ComponentRegistryEntry const& At(ComponentRegistry const& registry, size_t i) + const ComponentRegistryEntry& At(const ComponentRegistry& registry, size_t i) { if (i >= registry.size()) { throw std::out_of_range{"attempted to access an out-of-bounds registry entry"}; @@ -67,7 +67,7 @@ namespace osc } template - ComponentRegistryEntry const& Get(ComponentRegistry const& registry, T const& el) + const ComponentRegistryEntry& Get(ComponentRegistry const& registry, const T& el) { if (auto i = IndexOf(registry, el)) { return registry[*i]; @@ -78,7 +78,7 @@ namespace osc } template - ComponentRegistryEntry const& Get(ComponentRegistry const& registry, std::string_view componentClassName) + const ComponentRegistryEntry& Get(const ComponentRegistry& registry, std::string_view componentClassName) { if (auto i = IndexOf(registry, componentClassName)) { return registry[*i]; diff --git a/src/OpenSimCreator/ComponentRegistry/ComponentRegistryEntry.h b/src/OpenSimCreator/ComponentRegistry/ComponentRegistryEntry.h index 02849c6ae..dc018d08d 100644 --- a/src/OpenSimCreator/ComponentRegistry/ComponentRegistryEntry.h +++ b/src/OpenSimCreator/ComponentRegistry/ComponentRegistryEntry.h @@ -14,15 +14,15 @@ namespace osc ComponentRegistryEntry( std::string_view name_, std::string_view description_, - std::shared_ptr prototype_) : + std::shared_ptr prototype_) : ComponentRegistryEntryBase{name_, description_, std::move(prototype_)} {} - T const& prototype() const + const T& prototype() const { const auto& base = static_cast(*this); - return static_cast(base.prototype()); + return static_cast(base.prototype()); } std::unique_ptr instantiate() const diff --git a/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.cpp b/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.cpp index 371a6b75e..d41d18071 100644 --- a/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.cpp +++ b/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.cpp @@ -96,9 +96,9 @@ namespace } // returns a cached version of the custom component lookup - std::vector> const& GetCustomComponentList() + const std::vector>& GetCustomComponentList() { - static std::vector> const s_CustomComponentLUT = CreateCustomComponentList(); + static const std::vector> s_CustomComponentLUT = CreateCustomComponentList(); return s_CustomComponentLUT; } @@ -313,9 +313,9 @@ namespace } // returns a cached version of the description lookup - std::unordered_map const& GetComponentDescriptionLookup() + const std::unordered_map& GetComponentDescriptionLookup() { - static std::unordered_map const s_Lut = CreateComponentDescriptionLookup(); + static const std::unordered_map s_Lut = CreateComponentDescriptionLookup(); return s_Lut; } @@ -390,9 +390,9 @@ namespace } // cached version of the above - std::unordered_set const& GetComponentBlacklist() + const std::unordered_set& GetComponentBlacklist() { - static std::unordered_set const s_Blacklist = CreateComponentBlacklist(); + static const std::unordered_set s_Blacklist = CreateComponentBlacklist(); return s_Blacklist; } @@ -424,9 +424,9 @@ namespace } // cached version of the above - std::unordered_set const& GetSetOfAllGroupedElements() + const std::unordered_set& GetSetOfAllGroupedElements() { - static std::unordered_set const s_GroupedEls = CreateSetOfAllGroupedElements(); + static const std::unordered_set s_GroupedEls = CreateSetOfAllGroupedElements(); return s_GroupedEls; } @@ -617,19 +617,19 @@ namespace }; } - std::unordered_map> const& GetPrototypeLut() + const std::unordered_map>& GetPrototypeLut() { - static std::unordered_map> const s_Lut = CreatePrototypeLut(); + static const std::unordered_map> s_Lut = CreatePrototypeLut(); return s_Lut; } template T> - std::vector> CreatePrototypeLutT(bool useBlacklist = true) + std::vector> CreatePrototypeLutT(bool useBlacklist = true) { OpenSim::ArrayPtrs ptrs; OpenSim::Object::getRegisteredObjectsOfGivenType(ptrs); - std::vector> rv; + std::vector> rv; rv.reserve(ptrs.size()); const auto& protoLut = GetPrototypeLut(); @@ -637,7 +637,7 @@ namespace for (int i = 0; i < ptrs.size(); ++i) { - T const& v = *ptrs[i]; + const T& v = *ptrs[i]; const std::string& name = v.getConcreteClassName(); if (useBlacklist && blacklistLut.contains(name)) { @@ -647,7 +647,7 @@ namespace if (auto it = protoLut.find(name); it != protoLut.end()) { // it has already been manually created in the prototype LUT - use that - std::shared_ptr p = std::dynamic_pointer_cast(it->second); + std::shared_ptr p = std::dynamic_pointer_cast(it->second); if (p) { rv.push_back(p); @@ -671,8 +671,8 @@ namespace std::vector> CreateOtherComponentLut() { - std::unordered_set const& grouped = GetSetOfAllGroupedElements(); - std::unordered_set const& blacklisted = GetComponentBlacklist(); + const std::unordered_set& grouped = GetSetOfAllGroupedElements(); + const std::unordered_set& blacklisted = GetComponentBlacklist(); OpenSim::ArrayPtrs ptrs; OpenSim::Object::getRegisteredObjectsOfGivenType(ptrs); @@ -708,13 +708,13 @@ namespace ComponentRegistry CreateRegistryFromLUT( std::string_view name, std::string_view description, - std::vector> const& protoLut) + const std::vector>& protoLut) { ComponentRegistry rv{name, description}; // populate entries const auto& lut = GetComponentDescriptionLookup(); - for (std::shared_ptr const& el : protoLut) + for (const std::shared_ptr& el : protoLut) { std::string elName = el->getConcreteClassName(); std::string elDescription; @@ -754,7 +754,7 @@ namespace } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "Joint", @@ -764,7 +764,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "Contact Geometry", @@ -774,7 +774,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "Constraint", @@ -784,7 +784,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "Force", @@ -794,7 +794,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "Controller", @@ -804,7 +804,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "Probe", @@ -814,7 +814,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateRegistry( "WrapObject", @@ -825,7 +825,7 @@ ComponentRegistry const& osc::GetComponentRegistry() } template<> -ComponentRegistry const& osc::GetComponentRegistry() +const ComponentRegistry& osc::GetComponentRegistry() { static const auto s_StaticReg = CreateOtherComponentRegistry( "Component", @@ -834,7 +834,7 @@ ComponentRegistry const& osc::GetComponentRegistry() return s_StaticReg; } -ComponentRegistry const& osc::GetCustomComponentRegistry() +const ComponentRegistry& osc::GetCustomComponentRegistry() { static const auto s_StaticReg = CreateCustomComponentRegistry( "Experimental Components", @@ -843,7 +843,7 @@ ComponentRegistry const& osc::GetCustomComponentRegistry() return s_StaticReg; } -ComponentRegistry const& osc::GetAllRegisteredComponents() +const ComponentRegistry& osc::GetAllRegisteredComponents() { static const auto s_StaticReg = CreateRegistry( "All Components", diff --git a/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.h b/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.h index b00c43704..538bea261 100644 --- a/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.h +++ b/src/OpenSimCreator/ComponentRegistry/StaticComponentRegistries.h @@ -6,9 +6,9 @@ namespace osc { template class ComponentRegistry; } namespace osc { template - ComponentRegistry const& GetComponentRegistry(); + const ComponentRegistry& GetComponentRegistry(); - ComponentRegistry const& GetCustomComponentRegistry(); + const ComponentRegistry& GetCustomComponentRegistry(); - ComponentRegistry const& GetAllRegisteredComponents(); + const ComponentRegistry& GetAllRegisteredComponents(); } diff --git a/src/OpenSimCreator/Documents/CustomComponents/ICustomDecorationGenerator.h b/src/OpenSimCreator/Documents/CustomComponents/ICustomDecorationGenerator.h index 6d143b3a3..55bbb412e 100644 --- a/src/OpenSimCreator/Documents/CustomComponents/ICustomDecorationGenerator.h +++ b/src/OpenSimCreator/Documents/CustomComponents/ICustomDecorationGenerator.h @@ -22,14 +22,14 @@ namespace osc void generateCustomDecorations( const SimTK::State& state, - std::function const& callback) const + const std::function& callback) const { implGenerateCustomDecorations(state, callback); } private: virtual void implGenerateCustomDecorations( const SimTK::State&, - std::function const& + const std::function& ) const = 0; }; } diff --git a/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.cpp b/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.cpp index 6f4c25f8a..ade3ee1c0 100644 --- a/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.cpp +++ b/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.cpp @@ -8,7 +8,7 @@ void osc::mow::InMemoryMesh::implGenerateCustomDecorations( const SimTK::State& state, - std::function const& out) const + const std::function& out) const { out({ .mesh = m_OscMesh, diff --git a/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.h b/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.h index 19cef95b9..6a137bb26 100644 --- a/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.h +++ b/src/OpenSimCreator/Documents/CustomComponents/InMemoryMesh.h @@ -23,7 +23,7 @@ namespace osc::mow // do nothing: OpenSim Creator will detect `ICustomDecorationDecorator` and use that } private: - void implGenerateCustomDecorations(const SimTK::State&, std::function const&) const override; + void implGenerateCustomDecorations(const SimTK::State&, const std::function&) const override; Mesh m_OscMesh; }; diff --git a/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.cpp b/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.cpp index b1307bc90..419b24515 100644 --- a/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.cpp +++ b/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.cpp @@ -27,7 +27,7 @@ void osc::fd::ActionAddSphereInMeshFrame( UndoableModelStatePair& model, const OpenSim::Mesh& mesh, - std::optional const& maybeClickPosInGround) + const std::optional& maybeClickPosInGround) { // if the caller requests a location via a click, set the position accordingly const SimTK::Vec3 locationInMeshFrame = maybeClickPosInGround ? @@ -63,7 +63,7 @@ void osc::fd::ActionAddSphereInMeshFrame( void osc::fd::ActionAddOffsetFrameInMeshFrame( UndoableModelStatePair& model, const OpenSim::Mesh& mesh, - std::optional const& maybeClickPosInGround) + const std::optional& maybeClickPosInGround) { // if the caller requests a location via a click, set the position accordingly const SimTK::Vec3 locationInMeshFrame = maybeClickPosInGround ? @@ -237,7 +237,7 @@ void osc::fd::ActionSwapCrossProductEdgeOperands( } void osc::fd::ActionAddFrame( - std::shared_ptr const& model, + const std::shared_ptr& model, const Edge& firstEdge, CoordinateDirection firstEdgeAxis, const Edge& otherEdge, @@ -268,7 +268,7 @@ void osc::fd::ActionAddFrame( } void osc::fd::ActionCreateBodyFromFrame( - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::ComponentPath& frameAbsPath, const OpenSim::ComponentPath& meshAbsPath, const OpenSim::ComponentPath& jointFrameAbsPath, diff --git a/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.h b/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.h index 56ed1444b..62755a7df 100644 --- a/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.h +++ b/src/OpenSimCreator/Documents/FrameDefinition/FrameDefinitionActions.h @@ -22,13 +22,13 @@ namespace osc::fd void ActionAddSphereInMeshFrame( UndoableModelStatePair&, const OpenSim::Mesh&, - std::optional const& maybeClickPosInGround + const std::optional& maybeClickPosInGround ); void ActionAddOffsetFrameInMeshFrame( UndoableModelStatePair&, const OpenSim::Mesh&, - std::optional const& maybeClickPosInGround + const std::optional& maybeClickPosInGround ); void ActionAddPointToPointEdge( @@ -67,7 +67,7 @@ namespace osc::fd ); void ActionAddFrame( - std::shared_ptr const&, + const std::shared_ptr&, const Edge& firstEdge, CoordinateDirection firstEdgeAxis, const Edge& otherEdge, @@ -75,7 +75,7 @@ namespace osc::fd ); void ActionCreateBodyFromFrame( - std::shared_ptr const&, + const std::shared_ptr&, const OpenSim::ComponentPath& frameAbsPath, const OpenSim::ComponentPath& meshAbsPath, const OpenSim::ComponentPath& jointFrameAbsPath, diff --git a/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.cpp b/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.cpp index cc7b945bd..603354dae 100644 --- a/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.cpp +++ b/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.cpp @@ -45,7 +45,7 @@ namespace data = data.subspan(1); } - std::optional const x = from_chars_strip_whitespace(data[0]); + const std::optional x = from_chars_strip_whitespace(data[0]); if (!x) { if (lineNum == 0) @@ -57,7 +57,7 @@ namespace return CSVParseWarning{lineNum, "cannot parse X as a number"}; } } - std::optional const y = from_chars_strip_whitespace(data[1]); + const std::optional y = from_chars_strip_whitespace(data[1]); if (!y) { if (lineNum == 0) @@ -69,7 +69,7 @@ namespace return CSVParseWarning{lineNum, "cannot parse Y as a number"}; } } - std::optional const z = from_chars_strip_whitespace(data[2]); + const std::optional z = from_chars_strip_whitespace(data[2]); if (!z) { if (lineNum == 0) @@ -96,8 +96,8 @@ std::string osc::lm::to_string(const CSVParseWarning& warning) void osc::lm::ReadLandmarksFromCSV( std::istream& in, - std::function const& landmarkConsumer, - std::function const& warningConsumer) + const std::function& landmarkConsumer, + const std::function& warningConsumer) { std::vector cols; for (size_t line = 0; read_csv_row_into_vector(in, cols); ++line) @@ -113,7 +113,7 @@ void osc::lm::ReadLandmarksFromCSV( void osc::lm::WriteLandmarksToCSV( std::ostream& out, - std::function()> const& landmarkProducer, + const std::function()>& landmarkProducer, LandmarkCSVFlags flags) { // if applicable, emit header diff --git a/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.h b/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.h index 189adf67c..3d82c4ad5 100644 --- a/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.h +++ b/src/OpenSimCreator/Documents/Landmarks/LandmarkHelpers.h @@ -24,13 +24,13 @@ namespace osc::lm void ReadLandmarksFromCSV( std::istream&, - std::function const& landmarkConsumer, - std::function const& warningConsumer = [](auto){} + const std::function& landmarkConsumer, + const std::function& warningConsumer = [](auto){} ); void WriteLandmarksToCSV( std::ostream&, - std::function()> const& landmarkProducer, + const std::function()>& landmarkProducer, LandmarkCSVFlags = LandmarkCSVFlags::None ); diff --git a/src/OpenSimCreator/Documents/MeshImporter/Document.h b/src/OpenSimCreator/Documents/MeshImporter/Document.h index 8b39d4597..9876e179b 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/Document.h +++ b/src/OpenSimCreator/Documents/MeshImporter/Document.h @@ -44,8 +44,8 @@ namespace osc::mi using difference_type = ptrdiff_t; using value_type = T; using pointer = T*; - using const_pointer = T const*; - using reference = T const&; + using const_pointer = const T*; + using reference = const T&; using iterator_category = std::forward_iterator_tag; // caller-provided iterator @@ -152,7 +152,7 @@ namespace osc::mi } template T = MIObject> - T const* tryGetByID(UID id) const + const T* tryGetByID(UID id) const { return findByID(m_Objects, id); } @@ -164,7 +164,7 @@ namespace osc::mi } template T = MIObject> - T const& getByID(UID id) const + const T& getByID(UID id) const { return findByIDOrThrow(m_Objects, id); } @@ -203,9 +203,9 @@ namespace osc::mi } template T = MIObject> - Iterable iter() const + Iterable iter() const { - return Iterable{m_Objects}; + return Iterable{m_Objects}; } MIObject& insert(std::unique_ptr obj) @@ -274,7 +274,7 @@ namespace osc::mi return !m_SelectedObjectIDs.empty(); } - std::unordered_set const& getSelected() const + const std::unordered_set& getSelected() const { return m_SelectedObjectIDs; } diff --git a/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.cpp b/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.cpp index d80671fde..2a9ae3529 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.cpp +++ b/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.cpp @@ -43,7 +43,7 @@ bool osc::mi::CanAttachStationTo(const MIObject& e) }, e.toVariant()); } -std::array> const& osc::mi::GetSceneElClasses() +const std::array>& osc::mi::GetSceneElClasses() { static const auto s_Classes = std::to_array( { diff --git a/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.h b/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.h index c5239818c..16ba0ac27 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.h +++ b/src/OpenSimCreator/Documents/MeshImporter/MIObjectHelpers.h @@ -19,7 +19,7 @@ namespace osc::mi // returns `true` if a `StationEl` can be attached to the object bool CanAttachStationTo(const MIObject&); - std::array> const& GetSceneElClasses(); + const std::array>& GetSceneElClasses(); Vec3 AverageCenter(const Mesh&); Vec3 mass_center_of(const Mesh&); diff --git a/src/OpenSimCreator/Documents/MeshImporter/Mesh.cpp b/src/OpenSimCreator/Documents/MeshImporter/Mesh.cpp index d2934816d..d32b0ef51 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/Mesh.cpp +++ b/src/OpenSimCreator/Documents/MeshImporter/Mesh.cpp @@ -31,8 +31,7 @@ osc::mi::Mesh::Mesh( m_MeshData{std::move(meshData)}, m_Path{std::move(path)}, m_Name{SanitizeToOpenSimComponentName(m_Path.filename().replace_extension().string())} -{ -} +{} AABB osc::mi::Mesh::calcBounds() const { diff --git a/src/OpenSimCreator/Documents/MeshImporter/OpenSimBridge.cpp b/src/OpenSimCreator/Documents/MeshImporter/OpenSimBridge.cpp index dfe3c4e0a..bc33fe827 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/OpenSimBridge.cpp +++ b/src/OpenSimCreator/Documents/MeshImporter/OpenSimBridge.cpp @@ -547,7 +547,7 @@ namespace // then try to import all the meshes for (const OpenSim::Mesh& mesh : m.getComponentList()) { - std::optional const maybeMeshPath = FindGeometryFileAbsPath(m, mesh); + const std::optional maybeMeshPath = FindGeometryFileAbsPath(m, mesh); if (!maybeMeshPath) { diff --git a/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.cpp b/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.cpp index ec3e82b26..ed7507516 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.cpp +++ b/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.cpp @@ -38,7 +38,7 @@ bool osc::mi::point_axis_towards( bool osc::mi::TryAssignMeshAttachments( UndoableDocument& udoc, - std::unordered_set const& meshIDs, + const std::unordered_set& meshIDs, UID newAttachment) { Document& doc = udoc.upd_scratch(); diff --git a/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.h b/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.h index e5ce4f718..8a01819ea 100644 --- a/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.h +++ b/src/OpenSimCreator/Documents/MeshImporter/UndoableActions.h @@ -28,7 +28,7 @@ namespace osc::mi bool TryAssignMeshAttachments( UndoableDocument&, - std::unordered_set const& meshIDs, + const std::unordered_set& meshIDs, UID newAttachment ); diff --git a/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.cpp b/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.cpp index 440b93e8b..2b079f8bb 100644 --- a/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.cpp +++ b/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.cpp @@ -37,7 +37,7 @@ namespace }; template - UID id_of(T const& v) + UID id_of(const T& v) { return v.uid; } @@ -49,7 +49,7 @@ namespace }; template - std::string_view name_of(T const& v) + std::string_view name_of(const T& v) { return v.name; } diff --git a/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.h b/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.h index 606bcafa7..817b259a3 100644 --- a/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.h +++ b/src/OpenSimCreator/Documents/MeshWarper/TPSDocumentHelpers.h @@ -69,7 +69,7 @@ namespace osc } // returns the source/destination mesh in the given document - const inline Mesh& GetMesh(const TPSDocument& doc, TPSDocumentInputIdentifier which) + inline const Mesh& GetMesh(const TPSDocument& doc, TPSDocumentInputIdentifier which) { static_assert(num_options() == 2); return which == TPSDocumentInputIdentifier::Source ? doc.sourceMesh : doc.destinationMesh; diff --git a/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.cpp b/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.cpp index 3af55eb68..17b1ed793 100644 --- a/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.cpp +++ b/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.cpp @@ -153,7 +153,7 @@ void osc::ActionClearAllNonParticipatingLandmarks(UndoableTPSDocument& doc) void osc::ActionDeleteSceneElementsByID( UndoableTPSDocument& doc, - std::unordered_set const& elementIDs) + const std::unordered_set& elementIDs) { TPSDocument& scratch = doc.upd_scratch(); bool somethingDeleted = false; @@ -180,7 +180,7 @@ void osc::ActionLoadMeshFile( UndoableTPSDocument& doc, TPSDocumentInputIdentifier which) { - std::optional const maybeMeshPath = + const std::optional maybeMeshPath = prompt_user_to_select_file(GetSupportedSimTKMeshFormats()); if (!maybeMeshPath) { @@ -243,7 +243,7 @@ void osc::ActionSaveLandmarksToCSV( TPSDocumentInputIdentifier which, lm::LandmarkCSVFlags flags) { - std::optional const maybeCSVPath = + const std::optional maybeCSVPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); if (!maybeCSVPath) { @@ -274,7 +274,7 @@ void osc::ActionSaveNonParticipatingLandmarksToCSV( const TPSDocument& doc, lm::LandmarkCSVFlags flags) { - std::optional const maybeCSVPath = + const std::optional maybeCSVPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); if (!maybeCSVPath) { @@ -300,7 +300,7 @@ void osc::ActionSaveNonParticipatingLandmarksToCSV( void osc::ActionSavePairedLandmarksToCSV(const TPSDocument& doc, lm::LandmarkCSVFlags flags) { - std::optional const maybeCSVPath = + const std::optional maybeCSVPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); if (!maybeCSVPath) { @@ -354,7 +354,7 @@ void osc::ActionSavePairedLandmarksToCSV(const TPSDocument& doc, lm::LandmarkCSV void osc::ActionTrySaveMeshToObjFile(const Mesh& mesh, ObjWriterFlags flags) { - std::optional const maybeSavePath = + const std::optional maybeSavePath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("obj"); if (!maybeSavePath) { @@ -387,7 +387,7 @@ void osc::ActionTrySaveMeshToObjFile(const Mesh& mesh, ObjWriterFlags flags) void osc::ActionTrySaveMeshToStlFile(const Mesh& mesh) { - std::optional const maybeSTLPath = + const std::optional maybeSTLPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("stl"); if (!maybeSTLPath) { diff --git a/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.h b/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.h index 7f3124af2..7c6469dda 100644 --- a/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.h +++ b/src/OpenSimCreator/Documents/MeshWarper/UndoableTPSDocumentActions.h @@ -53,7 +53,7 @@ namespace osc void ActionClearAllNonParticipatingLandmarks(UndoableTPSDocument&); // deletes the specified landmarks from the TPS document - void ActionDeleteSceneElementsByID(UndoableTPSDocument&, std::unordered_set const&); + void ActionDeleteSceneElementsByID(UndoableTPSDocument&, const std::unordered_set&); void ActionDeleteElementByID(UndoableTPSDocument&, UID); // prompts the user to browse for an input mesh and assigns it to the document diff --git a/src/OpenSimCreator/Documents/Model/IConstModelStatePair.h b/src/OpenSimCreator/Documents/Model/IConstModelStatePair.h index da327a0dc..130a2384c 100644 --- a/src/OpenSimCreator/Documents/Model/IConstModelStatePair.h +++ b/src/OpenSimCreator/Documents/Model/IConstModelStatePair.h @@ -44,9 +44,9 @@ namespace osc } template - T const* getSelectedAs() const + const T* getSelectedAs() const { - return dynamic_cast(getSelected()); + return dynamic_cast(getSelected()); } const OpenSim::Component* getHovered() const diff --git a/src/OpenSimCreator/Documents/Model/ObjectPropertyEdit.h b/src/OpenSimCreator/Documents/Model/ObjectPropertyEdit.h index cb3a53f1a..a3d757acc 100644 --- a/src/OpenSimCreator/Documents/Model/ObjectPropertyEdit.h +++ b/src/OpenSimCreator/Documents/Model/ObjectPropertyEdit.h @@ -28,7 +28,7 @@ namespace osc const std::string& getComponentAbsPath() const; // empty if it's just a standalone object const std::string& getPropertyName() const; void apply(OpenSim::AbstractProperty&); - std::function const& getUpdater() const + const std::function& getUpdater() const { return m_Updater; } diff --git a/src/OpenSimCreator/Documents/Model/UndoableModelActions.cpp b/src/OpenSimCreator/Documents/Model/UndoableModelActions.cpp index 4ea694de9..5355edea8 100644 --- a/src/OpenSimCreator/Documents/Model/UndoableModelActions.cpp +++ b/src/OpenSimCreator/Documents/Model/UndoableModelActions.cpp @@ -76,12 +76,12 @@ using namespace osc; // helper functions namespace { - void OpenOsimInLoadingTab(ParentPtr const& api, std::filesystem::path p) + void OpenOsimInLoadingTab(const ParentPtr& api, std::filesystem::path p) { api->add_and_select_tab(api, std::move(p)); } - void DoOpenFileViaDialog(ParentPtr const& api) + void DoOpenFileViaDialog(const ParentPtr& api) { for (const auto& path : prompt_user_to_select_files({"osim"})) { OpenOsimInLoadingTab(api, path); @@ -108,7 +108,7 @@ namespace // we can save over this document - *IF* it's not an example file if (IsAnExampleFile(backing_path)) { - std::optional const maybePath = PromptSaveOneFile(); + const std::optional maybePath = PromptSaveOneFile(); return maybePath ? std::optional{maybePath->string()} : std::nullopt; } else @@ -120,7 +120,7 @@ namespace { // the model has no associated file, so prompt the user for a save // location - std::optional const maybePath = PromptSaveOneFile(); + const std::optional maybePath = PromptSaveOneFile(); return maybePath ? std::optional{maybePath->string()} : std::nullopt; } } @@ -243,7 +243,7 @@ namespace void osc::ActionSaveCurrentModelAs(UndoableModelStatePair& uim) { - std::optional const maybePath = PromptSaveOneFile(); + const std::optional maybePath = PromptSaveOneFile(); if (maybePath && TrySaveModel(uim.getModel(), maybePath->string())) { @@ -262,25 +262,25 @@ void osc::ActionSaveCurrentModelAs(UndoableModelStatePair& uim) } } -void osc::ActionNewModel(ParentPtr const& api) +void osc::ActionNewModel(const ParentPtr& api) { auto p = std::make_unique(); api->add_and_select_tab(api, std::move(p)); } -void osc::ActionOpenModel(ParentPtr const& api) +void osc::ActionOpenModel(const ParentPtr& api) { DoOpenFileViaDialog(api); } -void osc::ActionOpenModel(ParentPtr const& api, const std::filesystem::path& path) +void osc::ActionOpenModel(const ParentPtr& api, const std::filesystem::path& path) { OpenOsimInLoadingTab(api, path); } bool osc::ActionSaveModel(IMainUIStateAPI&, UndoableModelStatePair& model) { - std::optional const maybeUserSaveLoc = TryGetModelSaveLocation(model.getModel()); + const std::optional maybeUserSaveLoc = TryGetModelSaveLocation(model.getModel()); if (maybeUserSaveLoc && TrySaveModel(model.getModel(), *maybeUserSaveLoc)) { @@ -405,7 +405,7 @@ void osc::ActionClearSelectionFromEditedModel(UndoableModelStatePair& model) } bool osc::ActionLoadSTOFileAgainstModel( - ParentPtr const& parent, + const ParentPtr& parent, const UndoableModelStatePair& uim, const std::filesystem::path& stoPath) { @@ -429,7 +429,7 @@ bool osc::ActionLoadSTOFileAgainstModel( } bool osc::ActionStartSimulatingModel( - ParentPtr const& parent, + const ParentPtr& parent, const UndoableModelStatePair& uim) { BasicModelStatePair modelState{uim}; @@ -657,7 +657,7 @@ bool osc::ActionReloadOsimFromDisk(UndoableModelStatePair& uim, SceneCache& mesh } bool osc::ActionSimulateAgainstAllIntegrators( - ParentPtr const& parent, + const ParentPtr& parent, const UndoableModelStatePair& uim) { parent->add_and_select_tab( @@ -952,7 +952,7 @@ bool osc::ActionChangeJointTypeTo(UndoableModelStatePair& uim, const OpenSim::Co const OpenSim::ComponentPath ownerPath = GetAbsolutePath(*owner); - std::optional const maybeIdx = FindJointInParentJointSet(*target); + const std::optional maybeIdx = FindJointInParentJointSet(*target); if (!maybeIdx) { log_error("%s could not be found in its owner", jointPath.toString().c_str()); diff --git a/src/OpenSimCreator/Documents/Model/UndoableModelActions.h b/src/OpenSimCreator/Documents/Model/UndoableModelActions.h index d9d8bd1a4..1a0a79141 100644 --- a/src/OpenSimCreator/Documents/Model/UndoableModelActions.h +++ b/src/OpenSimCreator/Documents/Model/UndoableModelActions.h @@ -43,17 +43,17 @@ namespace osc // create a new model and show it in a new tab void ActionNewModel( - ParentPtr const& + const ParentPtr& ); // prompt a user to open a model file and open it in a new tab void ActionOpenModel( - ParentPtr const& + const ParentPtr& ); // open the specified model in a loading tab void ActionOpenModel( - ParentPtr const&, + const ParentPtr&, const std::filesystem::path& ); @@ -97,14 +97,14 @@ namespace osc // loads an STO file against the current model and opens it in a new tab bool ActionLoadSTOFileAgainstModel( - ParentPtr const&, + const ParentPtr&, const UndoableModelStatePair&, const std::filesystem::path& stoPath ); // start simulating the given model in a forward-dynamic simulator tab bool ActionStartSimulatingModel( - ParentPtr const&, + const ParentPtr&, const UndoableModelStatePair& ); @@ -161,7 +161,7 @@ namespace osc // start performing a series of simulations against the model by opening a tab that tries all possible integrators bool ActionSimulateAgainstAllIntegrators( - ParentPtr const&, + const ParentPtr&, const UndoableModelStatePair& ); diff --git a/src/OpenSimCreator/Documents/ModelWarper/TPSLandmarkPairWarperFactory.cpp b/src/OpenSimCreator/Documents/ModelWarper/TPSLandmarkPairWarperFactory.cpp index d2599a5ba..f829ecb6e 100644 --- a/src/OpenSimCreator/Documents/ModelWarper/TPSLandmarkPairWarperFactory.cpp +++ b/src/OpenSimCreator/Documents/ModelWarper/TPSLandmarkPairWarperFactory.cpp @@ -101,8 +101,8 @@ namespace } std::vector TryLoadPairedLandmarks( - [[maybe_unused]] std::optional const& maybeSourceLandmarksCSV, - [[maybe_unused]] std::optional const& maybeDestinationLandmarksCSV) + [[maybe_unused]] const std::optional& maybeSourceLandmarksCSV, + [[maybe_unused]] const std::optional& maybeDestinationLandmarksCSV) { std::vector src; if (maybeSourceLandmarksCSV) { diff --git a/src/OpenSimCreator/Documents/OutputExtractors/ComponentOutputSubfield.cpp b/src/OpenSimCreator/Documents/OutputExtractors/ComponentOutputSubfield.cpp index ceddda0ef..cc4206eb8 100644 --- a/src/OpenSimCreator/Documents/OutputExtractors/ComponentOutputSubfield.cpp +++ b/src/OpenSimCreator/Documents/OutputExtractors/ComponentOutputSubfield.cpp @@ -36,35 +36,35 @@ namespace // extract a `double` from an `OpenSim::Property` template<> - double extract<>(OpenSim::Output const& o, const SimTK::State& s) + double extract<>(const OpenSim::Output& o, const SimTK::State& s) { return o.getValue(s); } // extract X from `SimTK::Vec3` template<> - double extract(OpenSim::Output const& o, const SimTK::State& s) + double extract(const OpenSim::Output& o, const SimTK::State& s) { return o.getValue(s).get(0); } // extract Y from `SimTK::Vec3` template<> - double extract(OpenSim::Output const& o, const SimTK::State& s) + double extract(const OpenSim::Output& o, const SimTK::State& s) { return o.getValue(s).get(1); } // extract Z from `SimTK::Vec3` template<> - double extract(OpenSim::Output const& o, const SimTK::State& s) + double extract(const OpenSim::Output& o, const SimTK::State& s) { return o.getValue(s).get(2); } // extract magnitude from `SimTK::Vec3` template<> - double extract(OpenSim::Output const& o, const SimTK::State& s) + double extract(const OpenSim::Output& o, const SimTK::State& s) { return o.getValue(s).norm(); } @@ -111,11 +111,11 @@ std::span osc::GetAllSupportedOutputSubfields() bool osc::ProducesExtractableNumericValues(const OpenSim::AbstractOutput& ao) { - if (dynamic_cast const*>(&ao)) { + if (dynamic_cast*>(&ao)) { return true; } - if (dynamic_cast const*>(&ao)) { + if (dynamic_cast*>(&ao)) { return true; } @@ -124,7 +124,7 @@ bool osc::ProducesExtractableNumericValues(const OpenSim::AbstractOutput& ao) ComponentOutputSubfield osc::GetSupportedSubfields(const OpenSim::AbstractOutput& ao) { - if (dynamic_cast const*>(&ao)) { + if (dynamic_cast*>(&ao)) { return ComponentOutputSubfield::X | ComponentOutputSubfield::Y | @@ -140,12 +140,10 @@ SubfieldExtractorFunc osc::GetExtractorFuncOrNull( const OpenSim::AbstractOutput& ao, ComponentOutputSubfield subfield) { - if (dynamic_cast const*>(&ao)) - { + if (dynamic_cast*>(&ao)) { return extractTypeErased>; } - else if (dynamic_cast const*>(&ao)) - { + else if (dynamic_cast*>(&ao)) { switch (subfield) { case ComponentOutputSubfield::X: return extractTypeErased>; diff --git a/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.cpp b/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.cpp index f1e55eca7..aec88c5bc 100644 --- a/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.cpp +++ b/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.cpp @@ -24,7 +24,7 @@ float osc::IOutputExtractor::getValueFloat( void osc::IOutputExtractor::getValuesFloat( const OpenSim::Component& component, std::span reports, - std::function const& consumer) const + const std::function& consumer) const { const OutputValueExtractor extractor = getOutputValueExtractor(component); for (const auto& report : reports) { @@ -57,7 +57,7 @@ Vec2 osc::IOutputExtractor::getValueVec2( void osc::IOutputExtractor::getValuesVec2( const OpenSim::Component& component, std::span reports, - std::function const& consumer) const + const std::function& consumer) const { const OutputValueExtractor extractor = getOutputValueExtractor(component); for (const auto& report : reports) { diff --git a/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.h b/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.h index ec8a31f7b..5b7cd86e6 100644 --- a/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.h +++ b/src/OpenSimCreator/Documents/OutputExtractors/IOutputExtractor.h @@ -51,7 +51,7 @@ namespace osc void getValuesFloat( const OpenSim::Component&, std::span, - std::function const& consumer + const std::function& consumer ) const; std::vector slurpValuesFloat( @@ -67,7 +67,7 @@ namespace osc void getValuesVec2( const OpenSim::Component&, std::span, - std::function const& consumer + const std::function& consumer ) const; std::vector slurpValuesVec2( diff --git a/src/OpenSimCreator/Documents/OutputExtractors/IntegratorOutputExtractor.cpp b/src/OpenSimCreator/Documents/OutputExtractors/IntegratorOutputExtractor.cpp index d3d252d0e..1ded4bf56 100644 --- a/src/OpenSimCreator/Documents/OutputExtractors/IntegratorOutputExtractor.cpp +++ b/src/OpenSimCreator/Documents/OutputExtractors/IntegratorOutputExtractor.cpp @@ -106,15 +106,13 @@ namespace return rv; } - std::vector const& GetAllIntegratorOutputExtractors() + const std::vector& GetAllIntegratorOutputExtractors() { - static std::vector const s_IntegratorOutputs = ConstructIntegratorOutputExtractors(); + static const std::vector s_IntegratorOutputs = ConstructIntegratorOutputExtractors(); return s_IntegratorOutputs; } } -// public API - OutputValueExtractor osc::IntegratorOutputExtractor::implGetOutputValueExtractor(const OpenSim::Component&) const { return OutputValueExtractor{[id = m_AuxiliaryDataID](const SimulationReport& report) diff --git a/src/OpenSimCreator/Documents/OutputExtractors/MultiBodySystemOutputExtractor.cpp b/src/OpenSimCreator/Documents/OutputExtractors/MultiBodySystemOutputExtractor.cpp index 232b38b74..6b5e9b9c8 100644 --- a/src/OpenSimCreator/Documents/OutputExtractors/MultiBodySystemOutputExtractor.cpp +++ b/src/OpenSimCreator/Documents/OutputExtractors/MultiBodySystemOutputExtractor.cpp @@ -44,9 +44,9 @@ namespace return rv; } - std::vector const& GetAllMultiBodySystemOutputExtractors() + const std::vector& GetAllMultiBodySystemOutputExtractors() { - static std::vector const s_Outputs = ConstructMultiBodySystemOutputExtractors(); + static const std::vector s_Outputs = ConstructMultiBodySystemOutputExtractors(); return s_Outputs; } } diff --git a/src/OpenSimCreator/Documents/OutputExtractors/OutputExtractor.h b/src/OpenSimCreator/Documents/OutputExtractors/OutputExtractor.h index 522bb799d..e68c0b984 100644 --- a/src/OpenSimCreator/Documents/OutputExtractors/OutputExtractor.h +++ b/src/OpenSimCreator/Documents/OutputExtractors/OutputExtractor.h @@ -48,7 +48,7 @@ namespace osc void getValuesFloat( const OpenSim::Component& component, std::span reports, - std::function const& consumer) const + const std::function& consumer) const { m_Output->getValuesFloat(component, reports, consumer); } @@ -70,7 +70,7 @@ namespace osc void getValuesVec2( const OpenSim::Component& component, std::span report, - std::function const& consumer) const + const std::function& consumer) const { m_Output->getValuesVec2(component, report, consumer); } diff --git a/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulation.cpp b/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulation.cpp index 9b8678fd2..26f4cc6fa 100644 --- a/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulation.cpp +++ b/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulation.cpp @@ -267,8 +267,6 @@ class osc::ForwardDynamicSimulation::Impl final { }; -// public API - osc::ForwardDynamicSimulation::ForwardDynamicSimulation(BasicModelStatePair ms, const ForwardDynamicSimulatorParams& params) : m_Impl{std::make_unique(std::move(ms), params)} {} diff --git a/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulator.cpp b/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulator.cpp index 14b2f2ee0..06648aa30 100644 --- a/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulator.cpp +++ b/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulator.cpp @@ -190,7 +190,7 @@ namespace std::vector const& GetSimulatorOutputExtractors() { - static std::vector const s_Outputs = CreateSimulatorOutputExtractors(); + static const std::vector s_Outputs = CreateSimulatorOutputExtractors(); return s_Outputs; } diff --git a/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulatorParams.cpp b/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulatorParams.cpp index 1dee24a92..32574ee24 100644 --- a/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulatorParams.cpp +++ b/src/OpenSimCreator/Documents/Simulation/ForwardDynamicSimulatorParams.cpp @@ -29,8 +29,6 @@ namespace } -// public API - osc::ForwardDynamicSimulatorParams::ForwardDynamicSimulatorParams() : finalTime{SimulationClock::start() + SimulationClock::duration{10.0}}, reportingInterval{1.0/100.0}, diff --git a/src/OpenSimCreator/Documents/Simulation/SimulationReport.cpp b/src/OpenSimCreator/Documents/Simulation/SimulationReport.cpp index d49b1b564..d1ae82785 100644 --- a/src/OpenSimCreator/Documents/Simulation/SimulationReport.cpp +++ b/src/OpenSimCreator/Documents/Simulation/SimulationReport.cpp @@ -55,8 +55,6 @@ class osc::SimulationReport::Impl final { }; -// public API - osc::SimulationReport::SimulationReport() : m_Impl{std::make_shared()} {} diff --git a/src/OpenSimCreator/Documents/Simulation/SimulationStatus.cpp b/src/OpenSimCreator/Documents/Simulation/SimulationStatus.cpp index 6496b26b5..1b212d4fa 100644 --- a/src/OpenSimCreator/Documents/Simulation/SimulationStatus.cpp +++ b/src/OpenSimCreator/Documents/Simulation/SimulationStatus.cpp @@ -32,8 +32,6 @@ namespace } -// public API - std::span osc::GetAllSimulationStatuses() { return c_SimulatorStatuses; diff --git a/src/OpenSimCreator/Documents/Simulation/SingleStateSimulation.cpp b/src/OpenSimCreator/Documents/Simulation/SingleStateSimulation.cpp index 58f3c1fde..1f6da68ec 100644 --- a/src/OpenSimCreator/Documents/Simulation/SingleStateSimulation.cpp +++ b/src/OpenSimCreator/Documents/Simulation/SingleStateSimulation.cpp @@ -12,8 +12,7 @@ class osc::SingleStateSimulation::Impl final { public: explicit Impl(BasicModelStatePair modelState) : m_ModelState{std::move(modelState)} - { - } + {} SynchronizedValueGuard getModel() const { @@ -71,8 +70,6 @@ class osc::SingleStateSimulation::Impl final { }; -// public API (PIMPL) - osc::SingleStateSimulation::SingleStateSimulation(BasicModelStatePair modelState) : m_Impl{std::make_unique(std::move(modelState))} {} diff --git a/src/OpenSimCreator/Documents/Simulation/StoFileSimulation.cpp b/src/OpenSimCreator/Documents/Simulation/StoFileSimulation.cpp index 831884ca1..ea499dcee 100644 --- a/src/OpenSimCreator/Documents/Simulation/StoFileSimulation.cpp +++ b/src/OpenSimCreator/Documents/Simulation/StoFileSimulation.cpp @@ -61,7 +61,7 @@ namespace } template - std::unordered_set ToSet(OpenSim::Array const& v) + std::unordered_set ToSet(const OpenSim::Array& v) { std::unordered_set rv; rv.reserve(v.size()); @@ -73,13 +73,13 @@ namespace } template - int NumUniqueEntriesIn(OpenSim::Array const& v) + int NumUniqueEntriesIn(const OpenSim::Array& v) { return static_cast(ToSet(v).size()); } template - bool AllElementsUnique(OpenSim::Array const& v) + bool AllElementsUnique(const OpenSim::Array& v) { return NumUniqueEntriesIn(v) == v.size(); } @@ -108,7 +108,7 @@ namespace // etc for the column labels, so you *need* to map the storage column strings // carefully onto the model statevars std::vector missing; - OpenSim::Array const& storageColumnsIncludingTime = storage.getColumnLabels(); + const OpenSim::Array& storageColumnsIncludingTime = storage.getColumnLabels(); OpenSim::Array modelStateVars = model.getStateVariableNames(); if (!AllElementsUnique(storageColumnsIncludingTime)) @@ -185,7 +185,7 @@ namespace for (int row = 0; row < storage.getSize(); ++row) { OpenSim::StateVector* sv = storage.getStateVector(row); - OpenSim::Array const& cols = sv->getData(); + const OpenSim::Array& cols = sv->getData(); SimTK::Vector stateValsBuf = model.getStateVariableValues(model.getWorkingState()); for (auto [valueIdx, modelIdx] : lut) diff --git a/src/OpenSimCreator/Graphics/CachedModelRenderer.cpp b/src/OpenSimCreator/Graphics/CachedModelRenderer.cpp index 02de053b3..109ca9431 100644 --- a/src/OpenSimCreator/Graphics/CachedModelRenderer.cpp +++ b/src/OpenSimCreator/Graphics/CachedModelRenderer.cpp @@ -108,7 +108,7 @@ namespace class osc::CachedModelRenderer::Impl final { public: - explicit Impl(std::shared_ptr const& cache) : + explicit Impl(const std::shared_ptr& cache) : m_DecorationCache{cache}, m_Renderer{*cache} {} @@ -119,8 +119,7 @@ class osc::CachedModelRenderer::Impl final { float aspectRatio) { m_DecorationCache.update(modelState, params); - if (std::optional const aabb = m_DecorationCache.getAABB()) - { + if (const std::optional aabb = m_DecorationCache.getAABB()) { auto_focus(params.camera, *aabb, aspectRatio); } } @@ -190,9 +189,7 @@ class osc::CachedModelRenderer::Impl final { }; -// public API (PIMPL) - -osc::CachedModelRenderer::CachedModelRenderer(std::shared_ptr const& cache) : +osc::CachedModelRenderer::CachedModelRenderer(const std::shared_ptr& cache) : m_Impl{std::make_unique(cache)} {} osc::CachedModelRenderer::CachedModelRenderer(CachedModelRenderer&&) noexcept = default; diff --git a/src/OpenSimCreator/Graphics/CachedModelRenderer.h b/src/OpenSimCreator/Graphics/CachedModelRenderer.h index 814ad1dad..9b3228a44 100644 --- a/src/OpenSimCreator/Graphics/CachedModelRenderer.h +++ b/src/OpenSimCreator/Graphics/CachedModelRenderer.h @@ -21,7 +21,7 @@ namespace osc { class CachedModelRenderer final { public: - explicit CachedModelRenderer(std::shared_ptr const&); + explicit CachedModelRenderer(const std::shared_ptr&); CachedModelRenderer(const CachedModelRenderer&) = delete; CachedModelRenderer(CachedModelRenderer&&) noexcept; CachedModelRenderer& operator=(const CachedModelRenderer&) = delete; diff --git a/src/OpenSimCreator/Graphics/ComponentSceneDecorationFlagsTagger.cpp b/src/OpenSimCreator/Graphics/ComponentSceneDecorationFlagsTagger.cpp index 9b37cafda..9dc271062 100644 --- a/src/OpenSimCreator/Graphics/ComponentSceneDecorationFlagsTagger.cpp +++ b/src/OpenSimCreator/Graphics/ComponentSceneDecorationFlagsTagger.cpp @@ -11,8 +11,7 @@ osc::ComponentSceneDecorationFlagsTagger::ComponentSceneDecorationFlagsTagger( const OpenSim::Component* hovered_) : m_Selected{selected_}, m_Hovered{hovered_} -{ -} +{} void osc::ComponentSceneDecorationFlagsTagger::operator()( const OpenSim::Component& component, diff --git a/src/OpenSimCreator/Graphics/CustomRenderingOptions.cpp b/src/OpenSimCreator/Graphics/CustomRenderingOptions.cpp index 412b4f8b4..37add7b9f 100644 --- a/src/OpenSimCreator/Graphics/CustomRenderingOptions.cpp +++ b/src/OpenSimCreator/Graphics/CustomRenderingOptions.cpp @@ -71,7 +71,7 @@ void osc::CustomRenderingOptions::setDrawSelectionRims(bool v) SetOption(m_Flags, CustomRenderingOptionFlags::DrawSelectionRims, v); } -void osc::CustomRenderingOptions::forEachOptionAsAppSettingValue(std::function const& callback) const +void osc::CustomRenderingOptions::forEachOptionAsAppSettingValue(const std::function& callback) const { for (const auto& metadata : GetAllCustomRenderingOptionFlagsMetadata()) { @@ -79,7 +79,7 @@ void osc::CustomRenderingOptions::forEachOptionAsAppSettingValue(std::function const& lut) +void osc::CustomRenderingOptions::tryUpdFromValues(std::string_view keyPrefix, const std::unordered_map& lut) { for (const auto& metadata : GetAllCustomRenderingOptionFlagsMetadata()) { diff --git a/src/OpenSimCreator/Graphics/CustomRenderingOptions.h b/src/OpenSimCreator/Graphics/CustomRenderingOptions.h index c6f187e25..393117152 100644 --- a/src/OpenSimCreator/Graphics/CustomRenderingOptions.h +++ b/src/OpenSimCreator/Graphics/CustomRenderingOptions.h @@ -32,8 +32,8 @@ namespace osc bool getDrawSelectionRims() const; void setDrawSelectionRims(bool); - void forEachOptionAsAppSettingValue(std::function const&) const; - void tryUpdFromValues(std::string_view keyPrefix, std::unordered_map const&); + void forEachOptionAsAppSettingValue(const std::function&) const; + void tryUpdFromValues(std::string_view keyPrefix, const std::unordered_map&); friend bool operator==(const CustomRenderingOptions&, const CustomRenderingOptions&) = default; diff --git a/src/OpenSimCreator/Graphics/ModelRendererParams.cpp b/src/OpenSimCreator/Graphics/ModelRendererParams.cpp index a47675270..a15055868 100644 --- a/src/OpenSimCreator/Graphics/ModelRendererParams.cpp +++ b/src/OpenSimCreator/Graphics/ModelRendererParams.cpp @@ -45,7 +45,7 @@ namespace void UpdFromValues( std::string_view prefix, - std::unordered_map const& values, + const std::unordered_map& values, ModelRendererParams& params) { params.decorationOptions.tryUpdFromValues(std::string{prefix} + "decorations/", values); diff --git a/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.cpp b/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.cpp index f4bd55dd9..16c6b235f 100644 --- a/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.cpp +++ b/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.cpp @@ -178,7 +178,7 @@ namespace const SimTK::State& state, const OpenSimDecorationOptions& opts, float fixupScaleFactor, - std::function const& out) : + const std::function& out) : m_MeshCache{meshCache}, m_Model{model}, @@ -186,8 +186,7 @@ namespace m_Opts{opts}, m_FixupScaleFactor{fixupScaleFactor}, m_Out{out} - { - } + {} SceneCache& updMeshCache() { @@ -250,7 +249,7 @@ namespace const OpenSim::Component& componentToLinkTo, float fixupScaleFactor) { - std::function const callback = [this, &componentToLinkTo](SceneDecoration&& dec) + const std::function callback = [this, &componentToLinkTo](SceneDecoration&& dec) { consume(componentToLinkTo, std::move(dec)); }; @@ -313,7 +312,7 @@ namespace const SimTK::State& m_State; const OpenSimDecorationOptions& m_Opts; float m_FixupScaleFactor; - std::function const& m_Out; + const std::function& m_Out; SimTK::Array_ m_GeomList; }; @@ -414,7 +413,7 @@ namespace RendererState& rs, const OpenSim::Muscle& muscle) { - std::vector const pps = GetAllPathPoints(muscle.getGeometryPath(), rs.getState()); + const std::vector pps = GetAllPathPoints(muscle.getGeometryPath(), rs.getState()); if (pps.empty()) { return; // edge-case: there are no points in the muscle path @@ -704,7 +703,7 @@ namespace RendererState& rs, const OpenSim::Muscle& musc) { - std::vector const points = + const std::vector points = GetAllPathPoints(musc.getGeometryPath(), rs.getState()); const float radius = GetMuscleSize( @@ -734,7 +733,7 @@ namespace // selection hits to enable users to click on individual path points within // a path (#647) - std::vector const points = GetAllPathPoints(gp, rs.getState()); + const std::vector points = GetAllPathPoints(gp, rs.getState()); const Color color = GetGeometryPathColor(gp, rs.getState()); EmitPointBasedLine( @@ -776,7 +775,7 @@ namespace if (rs.getOptions().getShouldShowEffectiveMuscleLineOfActionForOrigin() || rs.getOptions().getShouldShowEffectiveMuscleLineOfActionForInsertion()) { - if (std::optional const loas = GetEffectiveLinesOfActionInGround(musc, rs.getState())) + if (const std::optional loas = GetEffectiveLinesOfActionInGround(musc, rs.getState())) { if (rs.getOptions().getShouldShowEffectiveMuscleLineOfActionForOrigin()) { @@ -794,8 +793,7 @@ namespace if (rs.getOptions().getShouldShowAnatomicalMuscleLineOfActionForOrigin() || rs.getOptions().getShouldShowAnatomicalMuscleLineOfActionForInsertion()) { - if (std::optional const loas = GetAnatomicalLinesOfActionInGround(musc, rs.getState())) - { + if (const std::optional loas = GetAnatomicalLinesOfActionInGround(musc, rs.getState())) { if (rs.getOptions().getShouldShowAnatomicalMuscleLineOfActionForOrigin()) { DrawLineOfActionArrow(rs, musc, loas->origin, c_AnatomicalLineOfActionColor); @@ -902,7 +900,7 @@ namespace } // else: try and compute a geometry-to-plane contact force and show it in-UI - std::optional const maybeContact = TryGetContactForceInGround( + const std::optional maybeContact = TryGetContactForceInGround( rs.getModel(), rs.getState(), hcf @@ -939,7 +937,7 @@ void osc::GenerateModelDecorations( const SimTK::State& state, const OpenSimDecorationOptions& opts, float fixupScaleFactor, - std::function const& out) + const std::function& out) { GenerateSubcomponentDecorations( meshCache, @@ -960,7 +958,7 @@ void osc::GenerateSubcomponentDecorations( const OpenSim::Component& subcomponent, const OpenSimDecorationOptions& opts, float fixupScaleFactor, - std::function const& out, + const std::function& out, bool inclusiveOfProvidedSubcomponent) { OSC_PERF("OpenSimRenderer/GenerateModelDecorations"); diff --git a/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.h b/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.h index 3816da364..c79c6c754 100644 --- a/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.h +++ b/src/OpenSimCreator/Graphics/OpenSimDecorationGenerator.h @@ -24,7 +24,7 @@ namespace osc const SimTK::State&, const OpenSimDecorationOptions&, float fixupScaleFactor, - std::function const& out + const std::function& out ); // generates 3D decorations only for `subcomponent` within the given {model, state} pair @@ -37,7 +37,7 @@ namespace osc const OpenSim::Component& subcomponent, const OpenSimDecorationOptions&, float fixupScaleFactor, - std::function const& out, + const std::function& out, bool inclusiveOfProvidedSubcomponent = true ); diff --git a/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.cpp b/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.cpp index 11e31715e..0216fccd4 100644 --- a/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.cpp +++ b/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.cpp @@ -17,8 +17,7 @@ osc::OpenSimDecorationOptions::OpenSimDecorationOptions() : m_MuscleColoringStyle{MuscleColoringStyle::Default}, m_MuscleSizingStyle{MuscleSizingStyle::Default}, m_Flags{OpenSimDecorationOptionFlags::Default} -{ -} +{} MuscleDecorationStyle osc::OpenSimDecorationOptions::getMuscleDecorationStyle() const { @@ -155,7 +154,7 @@ void osc::OpenSimDecorationOptions::setShouldShowContactForces(bool v) SetOption(m_Flags, OpenSimDecorationOptionFlags::ShouldShowContactForces, v); } -void osc::OpenSimDecorationOptions::forEachOptionAsAppSettingValue(std::function const& callback) const +void osc::OpenSimDecorationOptions::forEachOptionAsAppSettingValue(const std::function& callback) const { callback("muscle_decoration_style", AppSettingValue{GetMuscleDecorationStyleMetadata(m_MuscleDecorationStyle).id}); callback("muscle_coloring_style", AppSettingValue{GetMuscleColoringStyleMetadata(m_MuscleColoringStyle).id}); @@ -170,7 +169,7 @@ void osc::OpenSimDecorationOptions::forEachOptionAsAppSettingValue(std::function void osc::OpenSimDecorationOptions::tryUpdFromValues( std::string_view prefix, - std::unordered_map const& lut) + const std::unordered_map& lut) { // looks up a single element in the lut auto lookup = [ diff --git a/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.h b/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.h index 7dd989b7d..b5769ff7c 100644 --- a/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.h +++ b/src/OpenSimCreator/Graphics/OpenSimDecorationOptions.h @@ -62,8 +62,8 @@ namespace osc bool getShouldShowContactForces() const; void setShouldShowContactForces(bool); - void forEachOptionAsAppSettingValue(std::function const&) const; - void tryUpdFromValues(std::string_view keyPrefix, std::unordered_map const&); + void forEachOptionAsAppSettingValue(const std::function&) const; + void tryUpdFromValues(std::string_view keyPrefix, const std::unordered_map&); friend bool operator==(const OpenSimDecorationOptions&, const OpenSimDecorationOptions&) = default; diff --git a/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.cpp b/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.cpp index 204319937..4d69a29b8 100644 --- a/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.cpp +++ b/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.cpp @@ -53,7 +53,7 @@ void osc::GenerateDecorations( SceneCache& meshCache, const IConstModelStatePair& msp, const OpenSimDecorationOptions& options, - std::function const& out) + const std::function& out) { ComponentAbsPathDecorationTagger pathTagger{}; ComponentSceneDecorationFlagsTagger flagsTagger{msp.getSelected(), msp.getHovered()}; @@ -93,7 +93,7 @@ std::optional osc::GetClosestCollision( ); // find all collisions along the camera ray - std::vector const collisions = get_all_ray_collisions_with_scene( + const std::vector collisions = get_all_ray_collisions_with_scene( sceneBVH, sceneCache, taggedDrawlist, diff --git a/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.h b/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.h index 27bcb6308..fe0e8bb99 100644 --- a/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.h +++ b/src/OpenSimCreator/Graphics/OpenSimGraphicsHelpers.h @@ -32,7 +32,7 @@ namespace osc SceneCache&, const IConstModelStatePair&, const OpenSimDecorationOptions&, - std::function const& out + const std::function& out ); std::optional GetClosestCollision( diff --git a/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.cpp b/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.cpp index 45effb8a6..beff759f0 100644 --- a/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.cpp +++ b/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.cpp @@ -10,7 +10,7 @@ void osc::GenerateOverlayDecorations( SceneCache& meshCache, const OverlayDecorationOptions& params, const BVH& sceneBVH, - std::function const& out) + const std::function& out) { if (params.getDrawAABBs()) { diff --git a/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.h b/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.h index 1aaf01e59..14746693a 100644 --- a/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.h +++ b/src/OpenSimCreator/Graphics/OverlayDecorationGenerator.h @@ -15,6 +15,6 @@ namespace osc SceneCache&, const OverlayDecorationOptions&, const BVH& sceneBVH, - std::function const& out + const std::function& out ); } diff --git a/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.cpp b/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.cpp index f8441fc73..5835d9ae1 100644 --- a/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.cpp +++ b/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.cpp @@ -14,21 +14,21 @@ namespace "show_xz_grid", "XZ Grid", OverlayDecorationOptionGroup::Alignment, - OverlayDecorationOptionFlags::drawXZGrid, + OverlayDecorationOptionFlags::DrawXZGrid, }, OverlayDecorationOptionFlagsMetadata { "show_xy_grid", "XY Grid", OverlayDecorationOptionGroup::Alignment, - OverlayDecorationOptionFlags::drawXYGrid, + OverlayDecorationOptionFlags::DrawXYGrid, }, OverlayDecorationOptionFlagsMetadata { "show_yz_grid", "YZ Grid", OverlayDecorationOptionGroup::Alignment, - OverlayDecorationOptionFlags::drawYZGrid, + OverlayDecorationOptionFlags::DrawYZGrid, }, OverlayDecorationOptionFlagsMetadata { @@ -42,14 +42,14 @@ namespace "show_aabbs", "AABBs", OverlayDecorationOptionGroup::Development, - OverlayDecorationOptionFlags::drawAABBs, + OverlayDecorationOptionFlags::DrawAABBs, }, OverlayDecorationOptionFlagsMetadata { "show_bvh", "BVH", OverlayDecorationOptionGroup::Development, - OverlayDecorationOptionFlags::drawBVH, + OverlayDecorationOptionFlags::DrawBVH, }, }); } diff --git a/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.h b/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.h index ef89e2933..c589d1a7e 100644 --- a/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.h +++ b/src/OpenSimCreator/Graphics/OverlayDecorationOptionFlags.h @@ -12,12 +12,12 @@ namespace osc { enum class OverlayDecorationOptionFlags : uint32_t { None = 0, - drawXZGrid = 1<<0, - drawXYGrid = 1<<1, - drawYZGrid = 1<<2, + DrawXZGrid = 1<<0, + DrawXYGrid = 1<<1, + DrawYZGrid = 1<<2, DrawAxisLines = 1<<3, - drawAABBs = 1<<4, - drawBVH = 1<<5, + DrawAABBs = 1<<4, + DrawBVH = 1<<5, NUM_FLAGS = 6, Default = None, diff --git a/src/OpenSimCreator/Graphics/OverlayDecorationOptions.cpp b/src/OpenSimCreator/Graphics/OverlayDecorationOptions.cpp index a2ceda253..be41cb9e2 100644 --- a/src/OpenSimCreator/Graphics/OverlayDecorationOptions.cpp +++ b/src/OpenSimCreator/Graphics/OverlayDecorationOptions.cpp @@ -37,32 +37,32 @@ CStringView osc::OverlayDecorationOptions::getOptionGroupLabel(ptrdiff_t i) cons bool osc::OverlayDecorationOptions::getDrawXZGrid() const { - return m_Flags & OverlayDecorationOptionFlags::drawXZGrid; + return m_Flags & OverlayDecorationOptionFlags::DrawXZGrid; } void osc::OverlayDecorationOptions::setDrawXZGrid(bool v) { - SetOption(m_Flags, OverlayDecorationOptionFlags::drawXZGrid, v); + SetOption(m_Flags, OverlayDecorationOptionFlags::DrawXZGrid, v); } bool osc::OverlayDecorationOptions::getDrawXYGrid() const { - return m_Flags & OverlayDecorationOptionFlags::drawXYGrid; + return m_Flags & OverlayDecorationOptionFlags::DrawXYGrid; } void osc::OverlayDecorationOptions::setDrawXYGrid(bool v) { - SetOption(m_Flags, OverlayDecorationOptionFlags::drawXYGrid, v); + SetOption(m_Flags, OverlayDecorationOptionFlags::DrawXYGrid, v); } bool osc::OverlayDecorationOptions::getDrawYZGrid() const { - return m_Flags & OverlayDecorationOptionFlags::drawYZGrid; + return m_Flags & OverlayDecorationOptionFlags::DrawYZGrid; } void osc::OverlayDecorationOptions::setDrawYZGrid(bool v) { - SetOption(m_Flags, OverlayDecorationOptionFlags::drawYZGrid, v); + SetOption(m_Flags, OverlayDecorationOptionFlags::DrawYZGrid, v); } bool osc::OverlayDecorationOptions::getDrawAxisLines() const @@ -77,25 +77,25 @@ void osc::OverlayDecorationOptions::setDrawAxisLines(bool v) bool osc::OverlayDecorationOptions::getDrawAABBs() const { - return m_Flags & OverlayDecorationOptionFlags::drawAABBs; + return m_Flags & OverlayDecorationOptionFlags::DrawAABBs; } void osc::OverlayDecorationOptions::setDrawAABBs(bool v) { - SetOption(m_Flags, OverlayDecorationOptionFlags::drawAABBs, v); + SetOption(m_Flags, OverlayDecorationOptionFlags::DrawAABBs, v); } bool osc::OverlayDecorationOptions::getDrawBVH() const { - return m_Flags & OverlayDecorationOptionFlags::drawBVH; + return m_Flags & OverlayDecorationOptionFlags::DrawBVH; } void osc::OverlayDecorationOptions::setDrawBVH(bool v) { - SetOption(m_Flags, OverlayDecorationOptionFlags::drawBVH, v); + SetOption(m_Flags, OverlayDecorationOptionFlags::DrawBVH, v); } -void osc::OverlayDecorationOptions::forEachOptionAsAppSettingValue(std::function const& callback) const +void osc::OverlayDecorationOptions::forEachOptionAsAppSettingValue(const std::function& callback) const { for (const auto& metadata : GetAllOverlayDecorationOptionFlagsMetadata()) { @@ -103,7 +103,7 @@ void osc::OverlayDecorationOptions::forEachOptionAsAppSettingValue(std::function } } -void osc::OverlayDecorationOptions::tryUpdFromValues(std::string_view keyPrefix, std::unordered_map const& lut) +void osc::OverlayDecorationOptions::tryUpdFromValues(std::string_view keyPrefix, const std::unordered_map& lut) { for (size_t i = 0; i < num_flags(); ++i) { diff --git a/src/OpenSimCreator/Graphics/OverlayDecorationOptions.h b/src/OpenSimCreator/Graphics/OverlayDecorationOptions.h index 8be7b8f0e..e43744367 100644 --- a/src/OpenSimCreator/Graphics/OverlayDecorationOptions.h +++ b/src/OpenSimCreator/Graphics/OverlayDecorationOptions.h @@ -39,8 +39,8 @@ namespace osc bool getDrawBVH() const; void setDrawBVH(bool); - void forEachOptionAsAppSettingValue(std::function const&) const; - void tryUpdFromValues(std::string_view keyPrefix, std::unordered_map const&); + void forEachOptionAsAppSettingValue(const std::function&) const; + void tryUpdFromValues(std::string_view keyPrefix, const std::unordered_map&); friend bool operator==(const OverlayDecorationOptions&, const OverlayDecorationOptions&) = default; diff --git a/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.cpp b/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.cpp index 913dc27aa..e2358acff 100644 --- a/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.cpp +++ b/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.cpp @@ -125,7 +125,7 @@ namespace const SimTK::SimbodyMatterSubsystem& matter, const SimTK::State& st, float fixupScaleFactor, - std::function const& out) : + const std::function& out) : m_MeshCache{meshCache}, m_Matter{matter}, @@ -409,7 +409,7 @@ namespace const SimTK::SimbodyMatterSubsystem& m_Matter; const SimTK::State& m_State; float m_FixupScaleFactor; - std::function const& m_Consumer; + const std::function& m_Consumer; }; } @@ -419,7 +419,7 @@ void osc::GenerateDecorations( const SimTK::State& state, const SimTK::DecorativeGeometry& geom, float fixupScaleFactor, - std::function const& out) + const std::function& out) { GeometryImpl impl{meshCache, matter, state, fixupScaleFactor, out}; geom.implementGeometry(impl); diff --git a/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.h b/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.h index 9f229cbd5..73c0a4bfc 100644 --- a/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.h +++ b/src/OpenSimCreator/Graphics/SimTKDecorationGenerator.h @@ -18,6 +18,6 @@ namespace osc const SimTK::State&, const SimTK::DecorativeGeometry&, float fixupScaleFactor, - std::function const& out + const std::function& out ); } diff --git a/src/OpenSimCreator/UI/Experimental/MeshHittestTab.cpp b/src/OpenSimCreator/UI/Experimental/MeshHittestTab.cpp index c1dbe6c9a..8588cb174 100644 --- a/src/OpenSimCreator/UI/Experimental/MeshHittestTab.cpp +++ b/src/OpenSimCreator/UI/Experimental/MeshHittestTab.cpp @@ -201,11 +201,9 @@ CStringView osc::MeshHittestTab::id() return "OpenSim/Experimental/MeshHittest"; } -osc::MeshHittestTab::MeshHittestTab(ParentPtr const&) : +osc::MeshHittestTab::MeshHittestTab(const ParentPtr&) : m_Impl{std::make_unique()} -{ -} - +{} osc::MeshHittestTab::MeshHittestTab(MeshHittestTab&&) noexcept = default; osc::MeshHittestTab& osc::MeshHittestTab::operator=(MeshHittestTab&&) noexcept = default; osc::MeshHittestTab::~MeshHittestTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/Experimental/MeshHittestTab.h b/src/OpenSimCreator/UI/Experimental/MeshHittestTab.h index cadb1d884..6a2a62be1 100644 --- a/src/OpenSimCreator/UI/Experimental/MeshHittestTab.h +++ b/src/OpenSimCreator/UI/Experimental/MeshHittestTab.h @@ -15,7 +15,7 @@ namespace osc public: static CStringView id(); - explicit MeshHittestTab(ParentPtr const&); + explicit MeshHittestTab(const ParentPtr&); MeshHittestTab(const MeshHittestTab&) = delete; MeshHittestTab(MeshHittestTab&&) noexcept; MeshHittestTab& operator=(const MeshHittestTab&) = delete; diff --git a/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.cpp b/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.cpp index 33198da65..39650ce0d 100644 --- a/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.cpp +++ b/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.cpp @@ -95,9 +95,9 @@ namespace // a sequence of matchers to test against // // if the next N columns don't match any matchers, assume the column is `ColumnDataType::Unknown` - std::vector const& GetMatchers() + const std::vector& GetMatchers() { - static std::vector const s_Matchers = { + static const std::vector s_Matchers = { { ColumnDataType::PointForce, {"_vx", "_vy", "_vz", "_px", "_py", "_pz"}, @@ -166,7 +166,7 @@ namespace } // returns `true` if the provided labels [offset..offset+matcher.Suffixes.size()] all match up - bool IsMatch(OpenSim::Array const& labels, int offset, const ColumnDataTypeMatcher& matcher) + bool IsMatch(const OpenSim::Array& labels, int offset, const ColumnDataTypeMatcher& matcher) { int colsRemaining = labels.size() - offset; int numColsToTest = NumColumnsRequiredBy(matcher); @@ -190,7 +190,7 @@ namespace } // returns the matching column data type for the next set of columns - if a match can be found - std::optional TryMatchColumnsWithType(OpenSim::Array const& labels, int offset) + std::optional TryMatchColumnsWithType(const OpenSim::Array& labels, int offset) { for (const ColumnDataTypeMatcher& matcher : GetMatchers()) { @@ -214,7 +214,7 @@ namespace } // returns a sequence of parsed column descriptions, based on header labels - std::vector ParseColumnDescriptions(OpenSim::Array const& labels) + std::vector ParseColumnDescriptions(const OpenSim::Array& labels) { std::vector rv; int offset = 1; // offset 0 == "time" (skip it) @@ -282,7 +282,7 @@ namespace { const OpenSim::StateVector& v = *storage.getStateVector(row); double t = v.getTime(); - OpenSim::Array const& vs = v.getData(); + const OpenSim::Array& vs = v.getData(); size_t numCols = min(static_cast(v.getSize()), numDataCols); rv.push_back(t); @@ -463,7 +463,7 @@ namespace class osc::PreviewExperimentalDataTab::Impl final : public StandardTabImpl { public: - explicit Impl(ParentPtr const&) : + explicit Impl(const ParentPtr&) : StandardTabImpl{ICON_FA_DOT_CIRCLE " Experimental Data"} {} @@ -578,17 +578,14 @@ class osc::PreviewExperimentalDataTab::Impl final : public StandardTabImpl { }; -// public API (PIMPL) - CStringView osc::PreviewExperimentalDataTab::id() noexcept { return "OpenSim/Experimental/PreviewExperimentalData"; } -osc::PreviewExperimentalDataTab::PreviewExperimentalDataTab(ParentPtr const& ptr) : +osc::PreviewExperimentalDataTab::PreviewExperimentalDataTab(const ParentPtr& ptr) : m_Impl{std::make_unique(ptr)} {} - osc::PreviewExperimentalDataTab::PreviewExperimentalDataTab(PreviewExperimentalDataTab&&) noexcept = default; PreviewExperimentalDataTab& osc::PreviewExperimentalDataTab::operator=(PreviewExperimentalDataTab&&) noexcept = default; osc::PreviewExperimentalDataTab::~PreviewExperimentalDataTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.h b/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.h index 83a61d448..c7a8cf478 100644 --- a/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.h +++ b/src/OpenSimCreator/UI/Experimental/PreviewExperimentalDataTab.h @@ -16,7 +16,7 @@ namespace osc public: static CStringView id() noexcept; - explicit PreviewExperimentalDataTab(ParentPtr const&); + explicit PreviewExperimentalDataTab(const ParentPtr&); PreviewExperimentalDataTab(const PreviewExperimentalDataTab&) = delete; PreviewExperimentalDataTab(PreviewExperimentalDataTab&&) noexcept; PreviewExperimentalDataTab& operator=(const PreviewExperimentalDataTab&) = delete; diff --git a/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.cpp b/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.cpp index 4312d6ada..3b079f465 100644 --- a/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.cpp +++ b/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.cpp @@ -123,18 +123,14 @@ class osc::RendererGeometryShaderTab::Impl final { }; -// public API (PIMPL) - CStringView osc::RendererGeometryShaderTab::id() { return "OpenSim/Experimental/GeometryShader"; } -osc::RendererGeometryShaderTab::RendererGeometryShaderTab(ParentPtr const&) : +osc::RendererGeometryShaderTab::RendererGeometryShaderTab(const ParentPtr&) : m_Impl{std::make_unique()} -{ -} - +{} osc::RendererGeometryShaderTab::RendererGeometryShaderTab(RendererGeometryShaderTab&&) noexcept = default; osc::RendererGeometryShaderTab& osc::RendererGeometryShaderTab::operator=(RendererGeometryShaderTab&&) noexcept = default; osc::RendererGeometryShaderTab::~RendererGeometryShaderTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.h b/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.h index c74aeae88..70cd18897 100644 --- a/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.h +++ b/src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.h @@ -16,7 +16,7 @@ namespace osc public: static CStringView id(); - explicit RendererGeometryShaderTab(ParentPtr const&); + explicit RendererGeometryShaderTab(const ParentPtr&); RendererGeometryShaderTab(const RendererGeometryShaderTab&) = delete; RendererGeometryShaderTab(RendererGeometryShaderTab&&) noexcept; RendererGeometryShaderTab& operator=(const RendererGeometryShaderTab&) = delete; diff --git a/src/OpenSimCreator/UI/Experimental/TPS2DTab.cpp b/src/OpenSimCreator/UI/Experimental/TPS2DTab.cpp index b14700f30..0b88b63d4 100644 --- a/src/OpenSimCreator/UI/Experimental/TPS2DTab.cpp +++ b/src/OpenSimCreator/UI/Experimental/TPS2DTab.cpp @@ -527,18 +527,14 @@ class osc::TPS2DTab::Impl final { }; -// public API (PIMPL) - CStringView osc::TPS2DTab::id() { return "OpenSim/Experimental/TPS2D"; } -osc::TPS2DTab::TPS2DTab(ParentPtr const&) : +osc::TPS2DTab::TPS2DTab(const ParentPtr&) : m_Impl{std::make_unique()} -{ -} - +{} osc::TPS2DTab::TPS2DTab(TPS2DTab&&) noexcept = default; osc::TPS2DTab& osc::TPS2DTab::operator=(TPS2DTab&&) noexcept = default; osc::TPS2DTab::~TPS2DTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/Experimental/TPS2DTab.h b/src/OpenSimCreator/UI/Experimental/TPS2DTab.h index 962b7236c..35736147f 100644 --- a/src/OpenSimCreator/UI/Experimental/TPS2DTab.h +++ b/src/OpenSimCreator/UI/Experimental/TPS2DTab.h @@ -15,7 +15,7 @@ namespace osc public: static CStringView id(); - explicit TPS2DTab(ParentPtr const&); + explicit TPS2DTab(const ParentPtr&); TPS2DTab(const TPS2DTab&) = delete; TPS2DTab(TPS2DTab&&) noexcept; TPS2DTab& operator=(const TPS2DTab&) = delete; diff --git a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.cpp b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.cpp index 85c46e911..125c6cd23 100644 --- a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.cpp +++ b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.cpp @@ -78,7 +78,7 @@ namespace void PushCreateEdgeToOtherPointLayer( IEditorAPI& editor, - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::Point& point, const ModelEditorViewerPanelRightClickEvent& sourceEvent) { @@ -93,7 +93,7 @@ namespace options.canChooseItem = IsPoint; options.componentsBeingAssignedTo = {point.getAbsolutePathString()}; options.numComponentsUserMustChoose = 1; - options.onUserFinishedChoosing = [model, pointAPath = point.getAbsolutePathString()](std::unordered_set const& choices) -> bool + options.onUserFinishedChoosing = [model, pointAPath = point.getAbsolutePathString()](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -129,7 +129,7 @@ namespace void PushCreateMidpointToAnotherPointLayer( IEditorAPI& editor, - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::Point& point, const ModelEditorViewerPanelRightClickEvent& sourceEvent) { @@ -144,7 +144,7 @@ namespace options.canChooseItem = IsPoint; options.componentsBeingAssignedTo = {point.getAbsolutePathString()}; options.numComponentsUserMustChoose = 1; - options.onUserFinishedChoosing = [model, pointAPath = point.getAbsolutePathString()](std::unordered_set const& choices) -> bool + options.onUserFinishedChoosing = [model, pointAPath = point.getAbsolutePathString()](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -180,7 +180,7 @@ namespace void PushCreateCrossProductEdgeLayer( IEditorAPI& editor, - std::shared_ptr const& model, + const std::shared_ptr& model, const Edge& firstEdge, const ModelEditorViewerPanelRightClickEvent& sourceEvent) { @@ -195,7 +195,7 @@ namespace options.canChooseItem = IsEdge; options.componentsBeingAssignedTo = {firstEdge.getAbsolutePathString()}; options.numComponentsUserMustChoose = 1; - options.onUserFinishedChoosing = [model, edgeAPath = firstEdge.getAbsolutePathString()](std::unordered_set const& choices) -> bool + options.onUserFinishedChoosing = [model, edgeAPath = firstEdge.getAbsolutePathString()](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -231,7 +231,7 @@ namespace void PushPickOriginForFrameDefinitionLayer( ModelEditorViewerPanel& visualizer, - std::shared_ptr const& model, + const std::shared_ptr& model, const std::string& firstEdgeAbsPath, CoordinateDirection firstEdgeAxis, const std::string& secondEdgeAbsPath) @@ -245,7 +245,7 @@ namespace firstEdgeAbsPath = firstEdgeAbsPath, firstEdgeAxis, secondEdgeAbsPath - ](std::unordered_set const& choices) -> bool + ](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -294,7 +294,7 @@ namespace void PushPickOtherEdgeStateForFrameDefinitionLayer( ModelEditorViewerPanel& visualizer, - std::shared_ptr const& model, + const std::shared_ptr& model, const Edge& firstEdge, CoordinateDirection firstEdgeAxis) { @@ -308,7 +308,7 @@ namespace model, firstEdgeAbsPath = firstEdge.getAbsolutePathString(), firstEdgeAxis - ](std::unordered_set const& choices) -> bool + ](const std::unordered_set& choices) -> bool { // go into "pick origin" state @@ -337,10 +337,10 @@ namespace { void ActionPushCreateFrameLayer( IEditorAPI& editor, - std::shared_ptr const& model, + const std::shared_ptr& model, const Edge& firstEdge, CoordinateDirection firstEdgeAxis, - std::optional const& maybeSourceEvent) + const std::optional& maybeSourceEvent) { if (!maybeSourceEvent) { @@ -363,7 +363,7 @@ namespace void PushPickParentFrameForBodyCreactionLayer( ModelEditorViewerPanel& visualizer, - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::ComponentPath& frameAbsPath, const OpenSim::ComponentPath& meshAbsPath, const OpenSim::ComponentPath& jointFrameAbsPath) @@ -387,7 +387,7 @@ namespace frameAbsPath, meshAbsPath, jointFrameAbsPath - ](std::unordered_set const& choices) -> bool + ](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -418,7 +418,7 @@ namespace void PushPickJointFrameForBodyCreactionLayer( ModelEditorViewerPanel& visualizer, - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::ComponentPath& frameAbsPath, const OpenSim::ComponentPath& meshAbsPath) { @@ -431,7 +431,7 @@ namespace model, frameAbsPath, meshAbsPath - ](std::unordered_set const& choices) -> bool + ](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -462,7 +462,7 @@ namespace void PushPickMeshForBodyCreationLayer( ModelEditorViewerPanel& visualizer, - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::Frame& frame) { ChooseComponentsEditorLayerParameters options; @@ -473,7 +473,7 @@ namespace visualizerPtr = &visualizer, // TODO: implement weak_ptr for panel lookup model, frameAbsPath = frame.getAbsolutePath() - ](std::unordered_set const& choices) -> bool + ](const std::unordered_set& choices) -> bool { if (choices.empty()) { @@ -502,8 +502,8 @@ namespace void ActionCreateBodyFromFrame( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Frame& frame) { if (!maybeSourceEvent) @@ -586,8 +586,8 @@ namespace void DrawFocusCameraMenu( IEditorAPI& editor, - std::shared_ptr const&, - std::optional const& maybeSourceEvent, + const std::shared_ptr&, + const std::optional& maybeSourceEvent, const OpenSim::Component&) { if (maybeSourceEvent && ui::begin_menu(ICON_FA_CAMERA " Focus Camera")) @@ -617,8 +617,8 @@ namespace void DrawEdgeAddContextMenuItems( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const Edge& edge) { if (maybeSourceEvent && ui::draw_menu_item(ICON_FA_TIMES " Cross Product Edge")) @@ -714,8 +714,8 @@ namespace void DrawCreateBodyMenuItem( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Frame& frame) { const OpenSim::Component* groundOrExistingBody = dynamic_cast(&frame); @@ -736,8 +736,8 @@ namespace } } void DrawMeshAddContextMenuItems( - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Mesh& mesh) { if (ui::draw_menu_item(ICON_FA_CIRCLE " Sphere Landmark")) @@ -760,8 +760,8 @@ namespace void DrawPointAddContextMenuItems( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Point& point) { if (maybeSourceEvent && ui::draw_menu_item(ICON_FA_GRIP_LINES " Edge")) @@ -792,8 +792,8 @@ namespace void DrawRightClickedMeshContextMenu( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Mesh& mesh) { DrawRightClickedComponentContextMenuHeader(mesh); @@ -814,8 +814,8 @@ namespace void DrawRightClickedPointContextMenu( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Point& point) { DrawRightClickedComponentContextMenuHeader(point); @@ -832,8 +832,8 @@ namespace void DrawRightClickedPointToPointEdgeContextMenu( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const PointToPointEdge& edge) { DrawRightClickedComponentContextMenuHeader(edge); @@ -854,8 +854,8 @@ namespace void DrawRightClickedCrossProductEdgeContextMenu( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const CrossProductEdge& edge) { DrawRightClickedComponentContextMenuHeader(edge); @@ -876,8 +876,8 @@ namespace void DrawRightClickedFrameContextMenu( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Frame& frame) { DrawRightClickedComponentContextMenuHeader(frame); @@ -894,8 +894,8 @@ namespace void DrawRightClickedUnknownComponentContextMenu( IEditorAPI& editor, - std::shared_ptr const& model, - std::optional const& maybeSourceEvent, + const std::shared_ptr& model, + const std::optional& maybeSourceEvent, const OpenSim::Component& component) { DrawRightClickedComponentContextMenuHeader(component); @@ -1018,7 +1018,7 @@ namespace class osc::FrameDefinitionTab::Impl final : public IEditorAPI { public: - explicit Impl(ParentPtr const& parent_) : + explicit Impl(const ParentPtr& parent_) : m_Parent{parent_} { m_PanelManager->register_toggleable_panel( @@ -1209,18 +1209,14 @@ class osc::FrameDefinitionTab::Impl final : public IEditorAPI { }; -// public API (PIMPL) - CStringView osc::FrameDefinitionTab::id() { return c_TabStringID; } -osc::FrameDefinitionTab::FrameDefinitionTab(ParentPtr const& parent_) : +osc::FrameDefinitionTab::FrameDefinitionTab(const ParentPtr& parent_) : m_Impl{std::make_unique(parent_)} -{ -} - +{} osc::FrameDefinitionTab::FrameDefinitionTab(FrameDefinitionTab&&) noexcept = default; osc::FrameDefinitionTab& osc::FrameDefinitionTab::operator=(FrameDefinitionTab&&) noexcept = default; osc::FrameDefinitionTab::~FrameDefinitionTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.h b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.h index 3c8670407..c056e16fe 100644 --- a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.h +++ b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTab.h @@ -16,7 +16,7 @@ namespace osc public: static CStringView id(); - explicit FrameDefinitionTab(ParentPtr const&); + explicit FrameDefinitionTab(const ParentPtr&); FrameDefinitionTab(const FrameDefinitionTab&) = delete; FrameDefinitionTab(FrameDefinitionTab&&) noexcept; FrameDefinitionTab& operator=(const FrameDefinitionTab&) = delete; diff --git a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTabToolbar.cpp b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTabToolbar.cpp index 2b57a82d6..c4f1886f7 100644 --- a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTabToolbar.cpp +++ b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionTabToolbar.cpp @@ -26,8 +26,7 @@ osc::FrameDefinitionTabToolbar::FrameDefinitionTabToolbar( m_Label{label_}, m_TabHost{std::move(tabHost_)}, m_Model{std::move(model_)} -{ -} +{} void osc::FrameDefinitionTabToolbar::onDraw() { diff --git a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.cpp b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.cpp index ff9d8ff9a..cfba469a4 100644 --- a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.cpp +++ b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.cpp @@ -26,7 +26,7 @@ using namespace osc; void osc::fd::ActionPromptUserToAddMeshFiles(UndoableModelStatePair& model) { - std::vector const meshPaths = + const std::vector meshPaths = prompt_user_to_select_files(GetSupportedSimTKMeshFormats()); if (meshPaths.empty()) { @@ -87,7 +87,7 @@ std::unique_ptr osc::fd::MakeUndoableModelFromSceneModel } void osc::fd::ActionExportFrameDefinitionSceneModelToEditorTab( - ParentPtr const& tabHost, + const ParentPtr& tabHost, const UndoableModelStatePair& model) { auto maybeMainUIStateAPI = dynamic_parent_cast(tabHost); diff --git a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.h b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.h index 5f9dce4c9..f95bbbd9f 100644 --- a/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.h +++ b/src/OpenSimCreator/UI/FrameDefinition/FrameDefinitionUIHelpers.h @@ -18,7 +18,7 @@ namespace osc::fd ); void ActionExportFrameDefinitionSceneModelToEditorTab( - ParentPtr const&, + const ParentPtr&, const UndoableModelStatePair& ); } diff --git a/src/OpenSimCreator/UI/LoadingTab.cpp b/src/OpenSimCreator/UI/LoadingTab.cpp index 3f76770f5..1f6d2a248 100644 --- a/src/OpenSimCreator/UI/LoadingTab.cpp +++ b/src/OpenSimCreator/UI/LoadingTab.cpp @@ -157,8 +157,6 @@ class osc::LoadingTab::Impl final { }; -// public API (PIMPL) - osc::LoadingTab::LoadingTab( const ParentPtr& parent_, std::filesystem::path path_) : diff --git a/src/OpenSimCreator/UI/MeshImporter/MeshImporterSharedState.h b/src/OpenSimCreator/UI/MeshImporter/MeshImporterSharedState.h index 43aecae3e..55593911d 100644 --- a/src/OpenSimCreator/UI/MeshImporter/MeshImporterSharedState.h +++ b/src/OpenSimCreator/UI/MeshImporter/MeshImporterSharedState.h @@ -120,7 +120,7 @@ namespace osc::mi bool openOsimFileAsModelGraph() { - std::optional const maybeOsimPath = prompt_user_to_select_file({"osim"}); + const std::optional maybeOsimPath = prompt_user_to_select_file({"osim"}); if (maybeOsimPath) { @@ -137,7 +137,7 @@ namespace osc::mi bool exportAsModelGraphAsOsimFile() { - std::optional const maybeExportPath = + const std::optional maybeExportPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("osim"); if (!maybeExportPath) @@ -240,7 +240,7 @@ namespace osc::mi m_ModelGraphSnapshots.redo(); } - std::unordered_set const& getCurrentSelection() const + const std::unordered_set& getCurrentSelection() const { return getModelGraph().getSelected(); } @@ -307,7 +307,7 @@ namespace osc::mi void drawConnectionLines( const Color& color, - std::unordered_set const& excludedIDs) const + const std::unordered_set& excludedIDs) const { const Document& mg = getModelGraph(); ImU32 colorU32 = ui::to_ImU32(color); @@ -555,7 +555,7 @@ namespace osc::mi m_SceneScaleFactor = newScaleFactor; } - MeshImporterHover doHovertest(std::vector const& drawables) const + MeshImporterHover doHovertest(const std::vector& drawables) const { auto cache = App::singleton(App::resource_loader()); @@ -612,7 +612,7 @@ namespace osc::mi continue; } - std::optional const rc = get_closest_worldspace_ray_triangle_collision( + const std::optional rc = get_closest_worldspace_ray_triangle_collision( drawable.mesh, cache->get_bvh(drawable.mesh), drawable.transform, @@ -966,7 +966,7 @@ namespace osc::mi void drawConnectionLines( const MIObject& el, ImU32 color, - std::unordered_set const& excludedIDs) const + const std::unordered_set& excludedIDs) const { const Document& mg = getModelGraph(); for (int i = 0, len = el.getNumCrossReferences(); i < len; ++i) diff --git a/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.cpp b/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.cpp index a23783e8e..6e4182784 100644 --- a/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.cpp +++ b/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.cpp @@ -78,20 +78,18 @@ // mesh importer tab implementation class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { public: - explicit Impl(ParentPtr const& parent_) : + explicit Impl(const ParentPtr& parent_) : m_Parent{parent_}, m_Shared{std::make_shared()} - { - } + {} Impl( - ParentPtr const& parent_, + const ParentPtr& parent_, std::vector meshPaths_) : m_Parent{parent_}, m_Shared{std::make_shared(std::move(meshPaths_))} - { - } + {} UID getID() const { @@ -396,7 +394,7 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { // // transition the shown UI layer to one where the user is assigning a mesh - void transitionToAssigningMeshesNextFrame(std::unordered_set const& meshes, std::unordered_set const& existingAttachments) + void transitionToAssigningMeshesNextFrame(const std::unordered_set& meshes, const std::unordered_set& existingAttachments) { ChooseElLayerOptions opts; opts.canChooseBodies = true; @@ -1357,7 +1355,7 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { const osc::Mesh& mesh) { // prompt user for a save location - std::optional const maybeUserSaveLocation = + const std::optional maybeUserSaveLocation = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("obj"); if (!maybeUserSaveLocation) { @@ -1396,7 +1394,7 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { const osc::Mesh& mesh) { // prompt user for a save location - std::optional const maybeUserSaveLocation = + const std::optional maybeUserSaveLocation = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("stl"); if (!maybeUserSaveLocation) { @@ -1905,7 +1903,7 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { if (ui::draw_button(ICON_FA_EXPAND_ARROWS_ALT)) { - if (std::optional const sceneAABB = calcSceneAABB()) + if (const std::optional sceneAABB = calcSceneAABB()) { auto_focus(m_Shared->updCamera(), *sceneAABB, aspect_ratio_of(m_Shared->get3DSceneDims())); } @@ -2174,7 +2172,7 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { } // perform a hovertest on the current 3D scene to determine what the user's mouse is over - MeshImporterHover hovertestScene(std::vector const& drawables) + MeshImporterHover hovertestScene(const std::vector& drawables) { if (!m_Shared->isRenderHovered()) { @@ -2398,7 +2396,7 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { if (m_Maybe3DViewerModal) { // ensure it stays alive - even if it pops itself during the drawcall - std::shared_ptr const ptr = m_Maybe3DViewerModal; + const std::shared_ptr ptr = m_Maybe3DViewerModal; // open it "over" the whole UI as a "modal" - so that the user can't click things // outside of the panel @@ -2475,23 +2473,17 @@ class osc::mi::MeshImporterTab::Impl final : public IMeshImporterUILayerHost { }; -// public API (PIMPL) - osc::mi::MeshImporterTab::MeshImporterTab( - ParentPtr const& parent_) : + const ParentPtr& parent_) : m_Impl{std::make_unique(parent_)} -{ -} - +{} osc::mi::MeshImporterTab::MeshImporterTab( - ParentPtr const& parent_, + const ParentPtr& parent_, std::vector files_) : m_Impl{std::make_unique(parent_, std::move(files_))} -{ -} - +{} osc::mi::MeshImporterTab::MeshImporterTab(MeshImporterTab&&) noexcept = default; osc::mi::MeshImporterTab& osc::mi::MeshImporterTab::operator=(MeshImporterTab&&) noexcept = default; osc::mi::MeshImporterTab::~MeshImporterTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.h b/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.h index 9dac48741..e7508c909 100644 --- a/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.h +++ b/src/OpenSimCreator/UI/MeshImporter/MeshImporterTab.h @@ -16,8 +16,8 @@ namespace osc::mi { class MeshImporterTab final : public ITab { public: - explicit MeshImporterTab(ParentPtr const&); - MeshImporterTab(ParentPtr const&, std::vector); + explicit MeshImporterTab(const ParentPtr&); + MeshImporterTab(const ParentPtr&, std::vector); MeshImporterTab(const MeshImporterTab&) = delete; MeshImporterTab(MeshImporterTab&&) noexcept; MeshImporterTab& operator=(const MeshImporterTab&) = delete; diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.cpp b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.cpp index df5497bce..dcf24155c 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.cpp +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.cpp @@ -27,7 +27,7 @@ using namespace osc; class osc::MeshWarpingTab::Impl final { public: - explicit Impl(ParentPtr const& parent_) : m_Parent{parent_} + explicit Impl(const ParentPtr& parent_) : m_Parent{parent_} { m_PanelManager->register_toggleable_panel( "Source Mesh", @@ -214,18 +214,14 @@ class osc::MeshWarpingTab::Impl final { }; -// public API (PIMPL) - CStringView osc::MeshWarpingTab::id() { return "OpenSim/Warping"; } -osc::MeshWarpingTab::MeshWarpingTab(ParentPtr const& parent_) : +osc::MeshWarpingTab::MeshWarpingTab(const ParentPtr& parent_) : m_Impl{std::make_unique(parent_)} -{ -} - +{} osc::MeshWarpingTab::MeshWarpingTab(MeshWarpingTab&&) noexcept = default; osc::MeshWarpingTab& osc::MeshWarpingTab::operator=(MeshWarpingTab&&) noexcept = default; osc::MeshWarpingTab::~MeshWarpingTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.h index f09ca1b0a..a3e220af5 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTab.h @@ -16,7 +16,7 @@ namespace osc public: static CStringView id(); - explicit MeshWarpingTab(ParentPtr const&); + explicit MeshWarpingTab(const ParentPtr&); MeshWarpingTab(const MeshWarpingTab&) = delete; MeshWarpingTab(MeshWarpingTab&&) noexcept; MeshWarpingTab& operator=(const MeshWarpingTab&) = delete; diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabDecorationGenerators.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabDecorationGenerators.h index e0366ddb2..20ca0615d 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabDecorationGenerators.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabDecorationGenerators.h @@ -16,7 +16,7 @@ namespace osc const MeshWarpingTabSharedState& sharedState, const Mesh& tpsSourceOrDestinationMesh, bool wireframeMode, - std::function const& out, + const std::function& out, Color meshColor = Color::white()) { // draw the mesh diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabFileMenu.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabFileMenu.h index 998f5120c..620d817d7 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabFileMenu.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabFileMenu.h @@ -22,8 +22,7 @@ namespace osc explicit MeshWarpingTabFileMenu( std::shared_ptr tabState_) : m_State{std::move(tabState_)} - { - } + {} void onDraw() { diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabHover.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabHover.h index 8a54fdad6..98890bcfb 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabHover.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabHover.h @@ -17,8 +17,7 @@ namespace osc const Vec3& worldspaceLocation_) : m_Input{input_}, m_WorldspaceLocation{worldspaceLocation_} - { - } + {} explicit MeshWarpingTabHover( TPSDocumentElementID sceneElementID_, diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabInputMeshPanel.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabInputMeshPanel.h index a33f9bb6a..c1310f5bb 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabInputMeshPanel.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabInputMeshPanel.h @@ -74,7 +74,7 @@ namespace osc // mesh hittest: compute whether the user is hovering over the mesh (affects rendering) const Mesh& inputMesh = m_State->getScratchMesh(m_DocumentIdentifier); const BVH& inputMeshBVH = m_State->getScratchMeshBVH(m_DocumentIdentifier); - std::optional const meshCollision = m_LastTextureHittestResult.is_hovered ? + const std::optional meshCollision = m_LastTextureHittestResult.is_hovered ? get_closest_worldspace_ray_triangle_collision(inputMesh, inputMeshBVH, Transform{}, cameraRay) : std::nullopt; @@ -161,9 +161,8 @@ namespace osc std::optional& closest, const TPSDocumentLandmarkPair& landmark) const { - std::optional const maybePos = GetLocation(landmark, m_DocumentIdentifier); - if (!maybePos) - { + const std::optional maybePos = GetLocation(landmark, m_DocumentIdentifier); + if (!maybePos) { return; // landmark doesn't have a source/destination } @@ -216,22 +215,22 @@ namespace osc // renders this panel's 3D scene to a texture RenderTexture& renderScene( Vec2 dims, - std::optional const& maybeMeshCollision, - std::optional const& maybeLandmarkCollision) + const std::optional& maybeMeshCollision, + const std::optional& maybeLandmarkCollision) { const SceneRendererParams params = calc_standard_dark_scene_render_params( m_Camera, App::get().anti_aliasing_level(), dims ); - std::vector const decorations = generateDecorations(maybeMeshCollision, maybeLandmarkCollision); + const std::vector decorations = generateDecorations(maybeMeshCollision, maybeLandmarkCollision); return m_CachedRenderer.render(decorations, params); } // returns a fresh list of 3D decorations for this panel's 3D render std::vector generateDecorations( - std::optional const& maybeMeshCollision, - std::optional const& maybeLandmarkCollision) const + const std::optional& maybeMeshCollision, + const std::optional& maybeLandmarkCollision) const { std::vector decorations; decorations.reserve( @@ -240,7 +239,7 @@ namespace osc m_State->getScratch().nonParticipatingLandmarks.size() ); - std::function const decorationConsumer = + const std::function decorationConsumer = [&decorations](SceneDecoration&& dec) { decorations.push_back(std::move(dec)); }; // generate common decorations (mesh, wireframe, grid, etc.) @@ -267,7 +266,7 @@ namespace osc } void generateDecorationsForLandmarks( - std::function const& decorationConsumer) const + const std::function& decorationConsumer) const { for (const TPSDocumentLandmarkPair& landmarkPair : m_State->getScratch().landmarkPairs) { @@ -277,11 +276,10 @@ namespace osc void generateDecorationsForLandmark( const TPSDocumentLandmarkPair& landmarkPair, - std::function const& decorationConsumer) const + const std::function& decorationConsumer) const { - std::optional const maybeLocation = GetLocation(landmarkPair, m_DocumentIdentifier); - if (!maybeLocation) - { + const std::optional maybeLocation = GetLocation(landmarkPair, m_DocumentIdentifier); + if (!maybeLocation) { return; // no source/destination location for the landmark } @@ -307,22 +305,20 @@ namespace osc } void generateDecorationsForNonParticipatingLandmarks( - std::function const& decorationConsumer) const + const std::function& decorationConsumer) const { - if (m_DocumentIdentifier != TPSDocumentInputIdentifier::Source) - { + if (m_DocumentIdentifier != TPSDocumentInputIdentifier::Source) { return; // only show them on the source (to-be-warped) mesh } - for (const auto& nonParticipatingLandmark : m_State->getScratch().nonParticipatingLandmarks) - { + for (const auto& nonParticipatingLandmark : m_State->getScratch().nonParticipatingLandmarks) { generateDecorationsForNonParticipatingLandmark(nonParticipatingLandmark, decorationConsumer); } } void generateDecorationsForNonParticipatingLandmark( const TPSDocumentNonParticipatingLandmark& npl, - std::function const& decorationConsumer) const + const std::function& decorationConsumer) const { SceneDecoration decoration { @@ -350,7 +346,7 @@ namespace osc void generateDecorationsForMouseOverMeshHover( const Vec3& meshCollisionPosition, - std::function const& decorationConsumer) const + const std::function& decorationConsumer) const { const bool nonParticipating = isUserPlacingNonParticipatingLandmark(); @@ -372,8 +368,8 @@ namespace osc // handle any input-related side-effects void handleInputAndHoverEvents( const ui::HittestResult& htResult, - std::optional const& meshCollision, - std::optional const& landmarkCollision) + const std::optional& meshCollision, + const std::optional& landmarkCollision) { // event: if the user left-clicks and something is hovered, select it; otherwise, add a landmark if (htResult.is_left_click_released_without_dragging) diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabMainMenu.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabMainMenu.h index 17c2d54e4..41530fcb4 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabMainMenu.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabMainMenu.h @@ -17,8 +17,8 @@ namespace osc class MeshWarpingTabMainMenu final { public: explicit MeshWarpingTabMainMenu( - std::shared_ptr const& tabState_, - std::shared_ptr const& panelManager_) : + const std::shared_ptr& tabState_, + const std::shared_ptr& panelManager_) : m_FileMenu{tabState_}, m_EditMenu{tabState_}, diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabResultMeshPanel.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabResultMeshPanel.h index bbc05d5b2..617d738f4 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabResultMeshPanel.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabResultMeshPanel.h @@ -232,7 +232,7 @@ namespace osc std::vector generateDecorations() const { std::vector decorations; - std::function const decorationConsumer = + const std::function decorationConsumer = [&decorations](SceneDecoration&& dec) { decorations.push_back(std::move(dec)); }; AppendCommonDecorations( @@ -269,7 +269,7 @@ namespace osc // renders a panel to a texture via its renderer and returns a reference to the rendered texture RenderTexture& renderScene(Vec2 dims) { - std::vector const decorations = generateDecorations(); + const std::vector decorations = generateDecorations(); const SceneRendererParams params = calc_standard_dark_scene_render_params( m_Camera, App::get().anti_aliasing_level(), diff --git a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabUserSelection.h b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabUserSelection.h index d5cdd1411..e8cc8e697 100644 --- a/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabUserSelection.h +++ b/src/OpenSimCreator/UI/MeshWarper/MeshWarpingTabUserSelection.h @@ -25,7 +25,7 @@ namespace osc return m_SelectedSceneElements.contains(el); } - std::unordered_set const& getUnderlyingSet() const + const std::unordered_set& getUnderlyingSet() const { return m_SelectedSceneElements; } diff --git a/src/OpenSimCreator/UI/ModelEditor/AddBodyPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/AddBodyPopup.cpp index 4290a025c..430f2690a 100644 --- a/src/OpenSimCreator/UI/ModelEditor/AddBodyPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/AddBodyPopup.cpp @@ -235,16 +235,13 @@ class osc::AddBodyPopup::Impl final : public StandardPopup { }; -// public API - osc::AddBodyPopup::AddBodyPopup( std::string_view popupName, IEditorAPI* api, std::shared_ptr uum) : m_Impl{std::make_unique(popupName, api, std::move(uum))} -{ -} +{} osc::AddBodyPopup::AddBodyPopup(AddBodyPopup&&) noexcept = default; osc::AddBodyPopup& osc::AddBodyPopup::operator=(AddBodyPopup&&) noexcept = default; osc::AddBodyPopup::~AddBodyPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/AddComponentPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/AddComponentPopup.cpp index 6f1d5d232..ffba284ab 100644 --- a/src/OpenSimCreator/UI/ModelEditor/AddComponentPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/AddComponentPopup.cpp @@ -557,8 +557,6 @@ class osc::AddComponentPopup::Impl final : public StandardPopup { }; -// public API - osc::AddComponentPopup::AddComponentPopup( std::string_view popupName, IPopupAPI* api, @@ -566,9 +564,7 @@ osc::AddComponentPopup::AddComponentPopup( std::unique_ptr prototype) : m_Impl{std::make_unique(popupName, api, std::move(uum), std::move(prototype))} -{ -} - +{} osc::AddComponentPopup::AddComponentPopup(AddComponentPopup&&) noexcept = default; osc::AddComponentPopup& osc::AddComponentPopup::operator=(AddComponentPopup&&) noexcept = default; osc::AddComponentPopup::~AddComponentPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.cpp b/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.cpp index 81acb7119..cde5f0ade 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.cpp @@ -98,7 +98,7 @@ namespace // draw the `MenuItem`s for the "Add Wrap Object" menu void DrawAddWrapObjectsToPhysicalFrameMenuItems( IEditorAPI*, - std::shared_ptr const& uim, + const std::shared_ptr& uim, const OpenSim::ComponentPath& physicalFrameAbsPath) { // list each available `WrapObject` as something the user can add @@ -119,7 +119,7 @@ namespace // draw contextual actions (buttons, sliders) for a selected physical frame void DrawPhysicalFrameContextualActions( IEditorAPI* editorAPI, - std::shared_ptr const& uim, + const std::shared_ptr& uim, const OpenSim::ComponentPath& pfPath) { if (const auto* pf = FindComponent(uim->getModel(), pfPath)) @@ -134,7 +134,7 @@ namespace if (ui::begin_menu("Add")) { if (ui::draw_menu_item("Geometry")) { - std::function)> const callback = [uim, pfPath](auto geom) + const std::function)> callback = [uim, pfPath](auto geom) { ActionAttachGeometryToPhysicalFrame(*uim, pfPath, std::move(geom)); }; @@ -198,7 +198,7 @@ namespace // draw contextual actions (buttons, sliders) for a selected joint void DrawHCFContextualActions( IEditorAPI* api, - std::shared_ptr const& uim, + const std::shared_ptr& uim, const OpenSim::ComponentPath& hcfPath) { const auto* const hcf = FindComponent(uim->getModel(), hcfPath); @@ -232,7 +232,7 @@ namespace // draw contextual actions (buttons, sliders) for a selected path actuator void DrawPathActuatorContextualParams( IEditorAPI* api, - std::shared_ptr const& uim, + const std::shared_ptr& uim, const OpenSim::ComponentPath& paPath) { if (ui::draw_menu_item("Add Path Point")) @@ -383,7 +383,7 @@ class osc::ComponentContextMenu::Impl final : public StandardPopup { public: Impl( std::string_view popupName_, - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_, OpenSim::ComponentPath path_) : @@ -695,19 +695,15 @@ class osc::ComponentContextMenu::Impl final : public StandardPopup { }; -// public API (PIMPL) - osc::ComponentContextMenu::ComponentContextMenu( std::string_view popupName_, - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_, const OpenSim::ComponentPath& path_) : m_Impl{std::make_unique(popupName_, mainUIStateAPI_, editorAPI_, std::move(model_), path_)} -{ -} - +{} osc::ComponentContextMenu::ComponentContextMenu(ComponentContextMenu&&) noexcept = default; osc::ComponentContextMenu& osc::ComponentContextMenu::operator=(ComponentContextMenu&&) noexcept = default; osc::ComponentContextMenu::~ComponentContextMenu() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.h b/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.h index 74d01776c..9fa6b9a74 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.h +++ b/src/OpenSimCreator/UI/ModelEditor/ComponentContextMenu.h @@ -17,7 +17,7 @@ namespace osc public: ComponentContextMenu( std::string_view popupName, - ParentPtr const&, + const ParentPtr&, IEditorAPI*, std::shared_ptr, const OpenSim::ComponentPath& diff --git a/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.cpp b/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.cpp index 9803a3004..220a0e51c 100644 --- a/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.cpp @@ -31,7 +31,7 @@ class osc::CoordinateEditorPanel::Impl final : public StandardPanelImpl { Impl( std::string_view panelName_, - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr uum_) : @@ -39,8 +39,7 @@ class osc::CoordinateEditorPanel::Impl final : public StandardPanelImpl { m_MainUIStateAPI{mainUIStateAPI_}, m_EditorAPI{editorAPI_}, m_Model{std::move(uum_)} - { - } + {} private: @@ -96,8 +95,7 @@ class osc::CoordinateEditorPanel::Impl final : public StandardPanelImpl { } int id = 0; - for (const OpenSim::Coordinate* coordPtr : coordPtrs) - { + for (const OpenSim::Coordinate* coordPtr : coordPtrs) { ui::push_id(id++); drawRow(*coordPtr); ui::pop_id(); @@ -252,18 +250,14 @@ class osc::CoordinateEditorPanel::Impl final : public StandardPanelImpl { }; -// public API - osc::CoordinateEditorPanel::CoordinateEditorPanel( std::string_view panelName_, - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr uum_) : m_Impl{std::make_unique(panelName_, mainUIStateAPI_, editorAPI_, std::move(uum_))} -{ -} - +{} osc::CoordinateEditorPanel::CoordinateEditorPanel(CoordinateEditorPanel&&) noexcept = default; osc::CoordinateEditorPanel& osc::CoordinateEditorPanel::operator=(CoordinateEditorPanel&&) noexcept = default; osc::CoordinateEditorPanel::~CoordinateEditorPanel() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.h b/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.h index 2db80c9ed..347f88090 100644 --- a/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.h +++ b/src/OpenSimCreator/UI/ModelEditor/CoordinateEditorPanel.h @@ -17,7 +17,7 @@ namespace osc public: CoordinateEditorPanel( std::string_view panelName, - ParentPtr const&, + const ParentPtr&, IEditorAPI*, std::shared_ptr ); diff --git a/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.cpp b/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.cpp index 86b1153d6..00602c5f5 100644 --- a/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.cpp @@ -18,15 +18,14 @@ class osc::EditorTabStatusBar::Impl final { public: Impl( - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_) : m_MainUIStateAPI{mainUIStateAPI_}, m_EditorAPI{editorAPI_}, m_Model{std::move(model_)} - { - } + {} void onDraw() { @@ -40,9 +39,8 @@ class osc::EditorTabStatusBar::Impl final { { const OpenSim::Component* const c = m_Model->getSelected(); - if (c) - { - std::vector const els = GetPathElements(*c); + if (c) { + const std::vector els = GetPathElements(*c); for (ptrdiff_t i = 0; i < std::ssize(els)-1; ++i) { ui::push_id(i); @@ -99,17 +97,14 @@ class osc::EditorTabStatusBar::Impl final { std::shared_ptr m_Model; }; -// public API (PIMPL) osc::EditorTabStatusBar::EditorTabStatusBar( - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_) : m_Impl{std::make_unique(mainUIStateAPI_, editorAPI_, std::move(model_))} -{ -} - +{} osc::EditorTabStatusBar::EditorTabStatusBar(EditorTabStatusBar&&) noexcept = default; osc::EditorTabStatusBar& osc::EditorTabStatusBar::operator=(EditorTabStatusBar&&) noexcept = default; osc::EditorTabStatusBar::~EditorTabStatusBar() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.h b/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.h index 77fdb6d3d..7ae706f37 100644 --- a/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.h +++ b/src/OpenSimCreator/UI/ModelEditor/EditorTabStatusBar.h @@ -12,7 +12,7 @@ namespace osc class EditorTabStatusBar final { public: EditorTabStatusBar( - ParentPtr const&, + const ParentPtr&, IEditorAPI*, std::shared_ptr ); diff --git a/src/OpenSimCreator/UI/ModelEditor/ExportPointsPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/ExportPointsPopup.cpp index ba6986e3c..6c035525b 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ExportPointsPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ExportPointsPopup.cpp @@ -89,8 +89,7 @@ namespace ui::same_line(); ui::draw_text_disabled(component.getConcreteClassName()); - if (std::optional const pointInfo = TryExtractPointInfo(component, state)) - { + if (const std::optional pointInfo = TryExtractPointInfo(component, state)) { ui::draw_text_disabled("Expressed In: %s", pointInfo->frameAbsPath.toString().c_str()); } @@ -163,7 +162,7 @@ namespace PointSelectorUiState& uiState, const OpenSim::Model& model, const SimTK::State& state, - std::function const& predicate, + const std::function& predicate, SelectionState selectionState) { for (const OpenSim::Component& component : model.getComponentList()) @@ -386,7 +385,7 @@ namespace std::optional TryGetTransformToReexpressPointsIn( const OpenSim::Model& model, const SimTK::State& state, - std::optional const& maybeAbsPathOfFrameToReexpressPointsIn) + const std::optional& maybeAbsPathOfFrameToReexpressPointsIn) { if (!maybeAbsPathOfFrameToReexpressPointsIn) { @@ -403,7 +402,7 @@ namespace } std::vector GetSortedListOfOutputPointAbsPaths( - std::unordered_set const& unorderedPointAbsPaths, + const std::unordered_set& unorderedPointAbsPaths, bool shouldExportPointsWithAbsPathNames) { std::vector rv(unorderedPointAbsPaths.begin(), unorderedPointAbsPaths.end()); @@ -435,7 +434,7 @@ namespace const OpenSim::Model& model, const SimTK::State& state, bool shouldExportPointsWithAbsPathNames, - std::optional const& maybeGround2ReexpressedFrame, + const std::optional& maybeGround2ReexpressedFrame, const std::string& pointAbsPath, std::ostream& out) { @@ -445,7 +444,7 @@ namespace return; // skip writing: point no longer exists in model } - std::optional const poi = TryExtractPointInfo(*c, state); + const std::optional poi = TryExtractPointInfo(*c, state); if (!poi) { return; // skip writing: cannot extract point info for the component @@ -475,17 +474,17 @@ namespace void WritePointsAsCSVTo( const OpenSim::Model& model, const SimTK::State& state, - std::unordered_set const& pointAbsPaths, - std::optional const& maybeAbsPathOfFrameToReexpressPointsIn, + const std::unordered_set& pointAbsPaths, + const std::optional& maybeAbsPathOfFrameToReexpressPointsIn, bool shouldExportPointsWithAbsPathNames, std::ostream& out) { - std::vector const sortedRowAbsPaths = GetSortedListOfOutputPointAbsPaths( + const std::vector sortedRowAbsPaths = GetSortedListOfOutputPointAbsPaths( pointAbsPaths, shouldExportPointsWithAbsPathNames ); - std::optional const maybeGround2ReexpressedFrame = TryGetTransformToReexpressPointsIn( + const std::optional maybeGround2ReexpressedFrame = TryGetTransformToReexpressPointsIn( model, state, maybeAbsPathOfFrameToReexpressPointsIn @@ -514,14 +513,13 @@ namespace ExportStepReturn ActionPromptUserForSaveLocationAndExportPoints( const OpenSim::Model& model, const SimTK::State& state, - std::unordered_set const& pointAbsPaths, - std::optional const& maybeAbsPathOfFrameToReexpressPointsIn, + const std::unordered_set& pointAbsPaths, + const std::optional& maybeAbsPathOfFrameToReexpressPointsIn, bool shouldExportPointsWithAbsPathNames) { // prompt user to select a save location - std::optional const saveLoc = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); - if (!saveLoc) - { + const std::optional saveLoc = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); + if (!saveLoc) { return ExportStepReturn::UserCancelled; } @@ -555,8 +553,7 @@ class osc::ExportPointsPopup::Impl final : public StandardPopup { StandardPopup{popupName_}, m_Model{std::move(model_)} - { - } + {} private: void impl_draw_content() final @@ -614,15 +611,12 @@ class osc::ExportPointsPopup::Impl final : public StandardPopup { }; -// public API - osc::ExportPointsPopup::ExportPointsPopup( std::string_view popupName, std::shared_ptr model_) : m_Impl{std::make_unique(popupName, std::move(model_))} -{ -} +{} osc::ExportPointsPopup::ExportPointsPopup(ExportPointsPopup&&) noexcept = default; osc::ExportPointsPopup& osc::ExportPointsPopup::operator=(ExportPointsPopup&&) noexcept = default; osc::ExportPointsPopup::~ExportPointsPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.cpp b/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.cpp index ca09a276e..039744b0b 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.cpp @@ -24,15 +24,14 @@ class osc::ModelEditorMainMenu::Impl final { public: Impl( - ParentPtr const& mainStateAPI_, + const ParentPtr& mainStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_) : m_MainUIStateAPI{mainStateAPI_}, m_EditorAPI{editorAPI_}, m_Model{std::move(model_)} - { - } + {} void onDraw() { @@ -162,17 +161,13 @@ class osc::ModelEditorMainMenu::Impl final { }; -// public API (PIMPL) - osc::ModelEditorMainMenu::ModelEditorMainMenu( - ParentPtr const& mainStateAPI_, + const ParentPtr& mainStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_) : m_Impl{std::make_unique(mainStateAPI_, editorAPI_, std::move(model_))} -{ -} - +{} osc::ModelEditorMainMenu::ModelEditorMainMenu(ModelEditorMainMenu&&) noexcept = default; osc::ModelEditorMainMenu& osc::ModelEditorMainMenu::operator=(ModelEditorMainMenu&&) noexcept = default; osc::ModelEditorMainMenu::~ModelEditorMainMenu() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.h b/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.h index b480a9b66..264f66fa7 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.h +++ b/src/OpenSimCreator/UI/ModelEditor/ModelEditorMainMenu.h @@ -12,7 +12,7 @@ namespace osc class ModelEditorMainMenu final { public: ModelEditorMainMenu( - ParentPtr const&, + const ParentPtr&, IEditorAPI*, std::shared_ptr ); diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.cpp b/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.cpp index 9aa599f29..4ccba5bc3 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.cpp @@ -59,7 +59,7 @@ class osc::ModelEditorTab::Impl final : public IEditorAPI { public: Impl( - ParentPtr const& parent_, + const ParentPtr& parent_, std::unique_ptr model_) : m_Parent{parent_}, @@ -448,16 +448,12 @@ class osc::ModelEditorTab::Impl final : public IEditorAPI { }; -// public API (PIMPL) - osc::ModelEditorTab::ModelEditorTab( - ParentPtr const& parent_, + const ParentPtr& parent_, std::unique_ptr model_) : m_Impl{std::make_unique(parent_, std::move(model_))} -{ -} - +{} osc::ModelEditorTab::ModelEditorTab(ModelEditorTab&&) noexcept = default; osc::ModelEditorTab& osc::ModelEditorTab::operator=(ModelEditorTab&&) noexcept = default; osc::ModelEditorTab::~ModelEditorTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.h b/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.h index 6d2839439..2b0a6986e 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.h +++ b/src/OpenSimCreator/UI/ModelEditor/ModelEditorTab.h @@ -16,7 +16,7 @@ namespace osc class ModelEditorTab final : public ITab { public: ModelEditorTab( - ParentPtr const&, + const ParentPtr&, std::unique_ptr ); ModelEditorTab(const ModelEditorTab&) = delete; diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.cpp b/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.cpp index d73ae4b83..5dcc18f05 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.cpp @@ -26,7 +26,7 @@ class osc::ModelEditorToolbar::Impl final { public: Impl( std::string_view label_, - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_) : @@ -110,17 +110,14 @@ class osc::ModelEditorToolbar::Impl final { }; -// public API - osc::ModelEditorToolbar::ModelEditorToolbar( std::string_view label_, - ParentPtr const& mainUIStateAPI_, + const ParentPtr& mainUIStateAPI_, IEditorAPI* editorAPI_, std::shared_ptr model_) : m_Impl{std::make_unique(label_, mainUIStateAPI_, editorAPI_, std::move(model_))} -{ -} +{} osc::ModelEditorToolbar::ModelEditorToolbar(ModelEditorToolbar&&) noexcept = default; osc::ModelEditorToolbar& osc::ModelEditorToolbar::operator=(ModelEditorToolbar&&) noexcept = default; osc::ModelEditorToolbar::~ModelEditorToolbar() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.h b/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.h index 23e5ee6db..10c0ee7f2 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.h +++ b/src/OpenSimCreator/UI/ModelEditor/ModelEditorToolbar.h @@ -14,7 +14,7 @@ namespace osc public: ModelEditorToolbar( std::string_view label, - ParentPtr const&, + const ParentPtr&, IEditorAPI*, std::shared_ptr ); diff --git a/src/OpenSimCreator/UI/ModelEditor/ModelMusclePlotPanel.cpp b/src/OpenSimCreator/UI/ModelEditor/ModelMusclePlotPanel.cpp index 5478126f7..ab0cce22f 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ModelMusclePlotPanel.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ModelMusclePlotPanel.cpp @@ -640,7 +640,7 @@ namespace return *lock; } - SynchronizedValueGuard const> lockDataPoints() const + SynchronizedValueGuard> lockDataPoints() const { return m_DataPoints.lock(); } @@ -711,7 +711,7 @@ namespace std::optional ComputeLERPedY(const Plot& p, float x) { auto lock = p.lockDataPoints(); - std::span const points = *lock; + const std::span points = *lock; if (points.empty()) { @@ -789,7 +789,7 @@ namespace bool IsXInRange(const Plot& p, float x) { auto lock = p.lockDataPoints(); - std::span const points = *lock; + const std::span points = *lock; if (points.size() <= 1) { @@ -898,7 +898,7 @@ namespace continue; // skip: row does not contain enough columns } - std::optional const independentVar = from_chars_strip_whitespace(row.front()); + const std::optional independentVar = from_chars_strip_whitespace(row.front()); if (!independentVar) { continue; // skip: row does not contain a valid independent variable @@ -908,7 +908,7 @@ namespace for (size_t dependentCol = 1; dependentCol < row.size(); ++dependentCol) { const std::string& dependentVarStr = row[dependentCol]; - std::optional const dependentVar = from_chars_strip_whitespace(dependentVarStr); + const std::optional dependentVar = from_chars_strip_whitespace(dependentVarStr); if (!dependentVar) { continue; // skip: column cannot be parsed as a number @@ -988,7 +988,7 @@ namespace void ActionPromptUserToSavePlotToCSV(const OpenSim::Coordinate& coord, const PlotParameters& params, const Plot& plot) { - std::optional const maybeCSVPath = + const std::optional maybeCSVPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); if (maybeCSVPath) @@ -1017,7 +1017,7 @@ namespace void clearUnlockedPlots() { - std::erase_if(m_PreviousPlots, [](std::shared_ptr const& p) { return !p->getIsLocked(); }); + std::erase_if(m_PreviousPlots, [](const std::shared_ptr& p) { return !p->getIsLocked(); }); } PlottingTaskStatus getPlottingTaskStatus() const @@ -1181,7 +1181,7 @@ namespace // - you now have a list containing 0..`hmax` unlocked elements, plus locked elements, // where the unlocked elements are the most recently used - auto isFirstDeleteablePlot = [nth = 1, max = this->m_MaxHistoryEntries](std::shared_ptr const& p) mutable + auto isFirstDeleteablePlot = [nth = 1, max = this->m_MaxHistoryEntries](const std::shared_ptr& p) mutable { if (p->getIsLocked()) { @@ -1194,7 +1194,7 @@ namespace const auto forwardIt = backwardIt.base(); const ptrdiff_t idxOfDeleteableEnd = std::distance(m_PreviousPlots.begin(), forwardIt); - auto shouldDelete = [i = static_cast(0), idxOfDeleteableEnd](std::shared_ptr const& p) mutable + auto shouldDelete = [i = static_cast(0), idxOfDeleteableEnd](const std::shared_ptr& p) mutable { return i++ < idxOfDeleteableEnd && !p->getIsLocked(); }; @@ -1304,7 +1304,7 @@ namespace std::vector::const_iterator m_Cursor = m_Data.begin(); }; - bool LessThanAssumingEmptyHighest(std::optional const& a, std::optional const& b) + bool LessThanAssumingEmptyHighest(const std::optional& a, const std::optional& b) { // this is defined differently from the C++ standard, which makes the // empty optional the "minimum" value, logically @@ -1418,7 +1418,7 @@ namespace // over the current plot void ActionPromptUserForCSVOverlayFile(PlotLines& lines) { - std::optional const maybeCSVPath = + const std::optional maybeCSVPath = prompt_user_to_select_file({"csv"}); if (maybeCSVPath) @@ -1436,7 +1436,7 @@ namespace // that location void ActionPromptUserToSavePlotLinesToCSV(const OpenSim::Coordinate& coord, const PlotParameters& params, const PlotLines& lines) { - std::optional const maybeCSVPath = + const std::optional maybeCSVPath = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("csv"); if (maybeCSVPath) @@ -1896,7 +1896,7 @@ namespace // (try to) draw the hovered coordinate value as a faded dropline if (maybeMouseX) { - std::optional const maybeHoverY = ComputeLERPedY(m_Lines.getActivePlot(), *maybeMouseX); + const std::optional maybeHoverY = ComputeLERPedY(m_Lines.getActivePlot(), *maybeMouseX); if (maybeHoverY) { double v = *maybeHoverY; diff --git a/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.cpp b/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.cpp index 7014476bc..d452fd8d9 100644 --- a/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.cpp @@ -53,13 +53,12 @@ class osc::OutputWatchesPanel::Impl final : public StandardPanelImpl { Impl(std::string_view panelName_, std::shared_ptr model_, - ParentPtr const& api_) : + const ParentPtr& api_) : StandardPanelImpl{panelName_}, m_API{api_}, m_Model{std::move(model_)} - { - } + {} private: void impl_draw_content() final @@ -110,17 +109,13 @@ class osc::OutputWatchesPanel::Impl final : public StandardPanelImpl { }; -// public API (PIMPL) - osc::OutputWatchesPanel::OutputWatchesPanel( std::string_view panelName_, std::shared_ptr model_, - ParentPtr const& api_) : + const ParentPtr& api_) : m_Impl{std::make_unique(panelName_, std::move(model_), api_)} -{ -} - +{} osc::OutputWatchesPanel::OutputWatchesPanel(OutputWatchesPanel&&) noexcept = default; osc::OutputWatchesPanel& osc::OutputWatchesPanel::operator=(OutputWatchesPanel&&) noexcept = default; osc::OutputWatchesPanel::~OutputWatchesPanel() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.h b/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.h index d242afa59..dbaf98238 100644 --- a/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.h +++ b/src/OpenSimCreator/UI/ModelEditor/OutputWatchesPanel.h @@ -17,7 +17,7 @@ namespace osc OutputWatchesPanel( std::string_view panelName, std::shared_ptr, - ParentPtr const& + const ParentPtr& ); OutputWatchesPanel(const OutputWatchesPanel&) = delete; OutputWatchesPanel(OutputWatchesPanel&&) noexcept; diff --git a/src/OpenSimCreator/UI/ModelEditor/ReassignSocketPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/ReassignSocketPopup.cpp index 13aa8e90b..0d3e35205 100644 --- a/src/OpenSimCreator/UI/ModelEditor/ReassignSocketPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/ReassignSocketPopup.cpp @@ -241,7 +241,7 @@ class osc::ReassignSocketPopup::Impl final : public StandardPopup { }(); const auto* const physFrameSocket = - dynamic_cast const*>(&abstractSocket); + dynamic_cast*>(&abstractSocket); if (!physFrameSocket) { bool v = false; diff --git a/src/OpenSimCreator/UI/ModelEditor/Select1PFPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/Select1PFPopup.cpp index 8996be239..ebae925d2 100644 --- a/src/OpenSimCreator/UI/ModelEditor/Select1PFPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/Select1PFPopup.cpp @@ -53,17 +53,13 @@ class osc::Select1PFPopup::Impl final : public StandardPopup { }; -// public API (PIMPL) - osc::Select1PFPopup::Select1PFPopup( std::string_view popupName, std::shared_ptr model, std::function onSelection) : m_Impl{std::make_unique(popupName, std::move(model), std::move(onSelection))} -{ -} - +{} osc::Select1PFPopup::Select1PFPopup(Select1PFPopup&&) noexcept = default; osc::Select1PFPopup& osc::Select1PFPopup::operator=(Select1PFPopup&&) noexcept = default; osc::Select1PFPopup::~Select1PFPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/SelectComponentPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/SelectComponentPopup.cpp index 58d7cfbe8..066396499 100644 --- a/src/OpenSimCreator/UI/ModelEditor/SelectComponentPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/SelectComponentPopup.cpp @@ -24,8 +24,7 @@ class osc::SelectComponentPopup::Impl final : public StandardPopup { m_Model{std::move(model)}, m_OnSelection{std::move(onSelection)}, m_Filter{std::move(filter)} - { - } + {} private: void impl_draw_content() final @@ -68,9 +67,7 @@ osc::SelectComponentPopup::SelectComponentPopup( std::function filter) : m_Impl{std::make_unique(popupName, std::move(model), std::move(onSelection), std::move(filter))} -{ -} - +{} osc::SelectComponentPopup::SelectComponentPopup(SelectComponentPopup&&) noexcept = default; osc::SelectComponentPopup& osc::SelectComponentPopup::operator=(SelectComponentPopup&&) noexcept = default; osc::SelectComponentPopup::~SelectComponentPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelEditor/SelectGeometryPopup.cpp b/src/OpenSimCreator/UI/ModelEditor/SelectGeometryPopup.cpp index 840199a4d..d6aaced81 100644 --- a/src/OpenSimCreator/UI/ModelEditor/SelectGeometryPopup.cpp +++ b/src/OpenSimCreator/UI/ModelEditor/SelectGeometryPopup.cpp @@ -243,17 +243,13 @@ class osc::SelectGeometryPopup::Impl final : public StandardPopup { }; -// public API (PIMPL) - osc::SelectGeometryPopup::SelectGeometryPopup( std::string_view popupName, const std::filesystem::path& geometryDir, std::function)> onSelection) : m_Impl{std::make_unique(popupName, geometryDir, std::move(onSelection))} -{ -} - +{} osc::SelectGeometryPopup::SelectGeometryPopup(SelectGeometryPopup&&) noexcept = default; osc::SelectGeometryPopup& osc::SelectGeometryPopup::operator=(SelectGeometryPopup&&) noexcept = default; osc::SelectGeometryPopup::~SelectGeometryPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelWarper/ChecklistPanel.cpp b/src/OpenSimCreator/UI/ModelWarper/ChecklistPanel.cpp index 5af68fb1c..e38178213 100644 --- a/src/OpenSimCreator/UI/ModelWarper/ChecklistPanel.cpp +++ b/src/OpenSimCreator/UI/ModelWarper/ChecklistPanel.cpp @@ -29,7 +29,7 @@ using namespace osc::mow; namespace { template - EntryStyling CalcStyle(const UIState& state, T const& c) + EntryStyling CalcStyle(const UIState& state, const T& c) { return ToStyle(state.state(c)); } @@ -52,7 +52,7 @@ namespace } template - void DrawEntryIconAndText(const UIState& state, T const& c) + void DrawEntryIconAndText(const UIState& state, const T& c) { DrawEntryIconAndText(state, c, CalcStyle(state, c)); } @@ -67,7 +67,7 @@ namespace } template - void DrawDetailsTable(const UIState& state, T const& c) + void DrawDetailsTable(const UIState& state, const T& c) { if (ui::begin_table("##Details", 2)) { @@ -88,7 +88,7 @@ namespace } template - void DrawChecklist(const UIState& state, T const& c) + void DrawChecklist(const UIState& state, const T& c) { ui::indent(5.0f); int id = 0; @@ -104,7 +104,7 @@ namespace } template - void DrawTooltipContent(const UIState& state, T const& c) + void DrawTooltipContent(const UIState& state, const T& c) { DrawTooltipHeader(state, c); @@ -120,7 +120,7 @@ namespace } template - void DrawEntry(const UIState& state, T const& c) + void DrawEntry(const UIState& state, const T& c) { DrawEntryIconAndText(state, c); if (ui::is_item_hovered(ImGuiHoveredFlags_ForTooltip)) { diff --git a/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.cpp b/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.cpp index 05eaa759a..511fcb702 100644 --- a/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.cpp +++ b/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.cpp @@ -26,7 +26,7 @@ namespace class osc::mow::ModelWarperTab::Impl final : public StandardTabImpl { public: - explicit Impl(ParentPtr const& tabHost) : + explicit Impl(const ParentPtr& tabHost) : StandardTabImpl{c_TabStringID}, m_TabHost{tabHost} { @@ -106,17 +106,14 @@ class osc::mow::ModelWarperTab::Impl final : public StandardTabImpl { }; -// public API - CStringView osc::mow::ModelWarperTab::id() { return c_TabStringID; } -osc::mow::ModelWarperTab::ModelWarperTab(ParentPtr const& tabHost) : +osc::mow::ModelWarperTab::ModelWarperTab(const ParentPtr& tabHost) : m_Impl{std::make_unique(tabHost)} {} - osc::mow::ModelWarperTab::ModelWarperTab(ModelWarperTab&&) noexcept = default; osc::mow::ModelWarperTab& osc::mow::ModelWarperTab::operator=(ModelWarperTab&&) noexcept = default; osc::mow::ModelWarperTab::~ModelWarperTab() noexcept = default; diff --git a/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.h b/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.h index bbd9de9c4..9a02f94aa 100644 --- a/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.h +++ b/src/OpenSimCreator/UI/ModelWarper/ModelWarperTab.h @@ -17,7 +17,7 @@ namespace osc::mow public: static CStringView id(); - explicit ModelWarperTab(ParentPtr const&); + explicit ModelWarperTab(const ParentPtr&); ModelWarperTab(const ModelWarperTab&) = delete; ModelWarperTab(ModelWarperTab&&) noexcept; ModelWarperTab& operator=(const ModelWarperTab&) = delete; diff --git a/src/OpenSimCreator/UI/ModelWarper/UIState.h b/src/OpenSimCreator/UI/ModelWarper/UIState.h index 307c0d656..f98c1ef13 100644 --- a/src/OpenSimCreator/UI/ModelWarper/UIState.h +++ b/src/OpenSimCreator/UI/ModelWarper/UIState.h @@ -26,7 +26,7 @@ namespace osc::mow { class UIState final { public: - explicit UIState(ParentPtr const& tabHost) : + explicit UIState(const ParentPtr& tabHost) : m_TabHost{tabHost} {} diff --git a/src/OpenSimCreator/UI/Shared/BasicWidgets.cpp b/src/OpenSimCreator/UI/Shared/BasicWidgets.cpp index 9b69a8f31..37fd32ebb 100644 --- a/src/OpenSimCreator/UI/Shared/BasicWidgets.cpp +++ b/src/OpenSimCreator/UI/Shared/BasicWidgets.cpp @@ -110,7 +110,7 @@ namespace bool DrawOutputWithSubfieldsMenu( const OpenSim::AbstractOutput& o, - std::function)> const& onUserSelection) + const std::function)>& onUserSelection) { bool outputAdded = false; ComponentOutputSubfield supportedSubfields = GetSupportedSubfields(o); @@ -142,7 +142,7 @@ namespace bool DrawOutputWithNoSubfieldsMenuItem( const OpenSim::AbstractOutput& o, - std::function)> const& onUserSelection) + const std::function)>& onUserSelection) { // can only plot top-level of output @@ -199,7 +199,7 @@ namespace const OpenSim::Frame& frame) { // prompt user for a save location - std::optional const maybeUserSaveLocation = + const std::optional maybeUserSaveLocation = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("obj"); if (!maybeUserSaveLocation) { @@ -247,7 +247,7 @@ namespace const OpenSim::Frame& frame) { // prompt user for a save location - std::optional const maybeUserSaveLocation = + const std::optional maybeUserSaveLocation = PromptUserForFileSaveLocationAndAddExtensionIfNecessary("stl"); if (!maybeUserSaveLocation) { @@ -355,7 +355,7 @@ void osc::DrawSelectOwnerMenu(IModelStatePair& model, const OpenSim::Component& bool osc::DrawRequestOutputMenuOrMenuItem( const OpenSim::AbstractOutput& o, - std::function)> const& onUserSelection) + const std::function)>& onUserSelection) { if (GetSupportedSubfields(o) == ComponentOutputSubfield::None) { @@ -369,7 +369,7 @@ bool osc::DrawRequestOutputMenuOrMenuItem( bool osc::DrawWatchOutputMenu( const OpenSim::Component& c, - std::function)> const& onUserSelection) + const std::function)>& onUserSelection) { bool outputAdded = false; @@ -502,7 +502,7 @@ void osc::DrawOutputNameColumn( void osc::DrawWithRespectToMenuContainingMenuPerFrame( const OpenSim::Component& root, - std::function const& onFrameMenuOpened, + const std::function& onFrameMenuOpened, const OpenSim::Frame* maybeParent) { ui::draw_text_disabled("With Respect to:"); @@ -536,7 +536,7 @@ void osc::DrawWithRespectToMenuContainingMenuPerFrame( void osc::DrawWithRespectToMenuContainingMenuItemPerFrame( const OpenSim::Component& root, - std::function const& onFrameMenuItemClicked, + const std::function& onFrameMenuItemClicked, const OpenSim::Frame* maybeParent = nullptr) { ui::draw_text_disabled("With Respect to:"); @@ -1121,7 +1121,7 @@ bool osc::DrawViewerTopButtonRow( ModelRendererParams& params, std::span, IconCache& iconCache, - std::function const& drawExtraElements) + const std::function& drawExtraElements) { bool edited = false; @@ -1158,7 +1158,7 @@ bool osc::DrawCameraControlButtons( ModelRendererParams& params, std::span drawlist, const Rect& viewerScreenRect, - std::optional const& maybeSceneAABB, + const std::optional& maybeSceneAABB, IconCache& iconCache, Vec2 desiredTopCentroid) { @@ -1232,7 +1232,7 @@ bool osc::DrawViewerImGuiOverlays( std::optional maybeSceneAABB, const Rect& renderRect, IconCache& iconCache, - std::function const& drawExtraElementsInTop) + const std::function& drawExtraElementsInTop) { bool edited = false; @@ -1285,7 +1285,7 @@ bool osc::BeginToolbar(CStringView label, std::optional padding) return open; } -void osc::DrawNewModelButton(ParentPtr const& api) +void osc::DrawNewModelButton(const ParentPtr& api) { if (ui::draw_button(ICON_FA_FILE)) { @@ -1295,7 +1295,7 @@ void osc::DrawNewModelButton(ParentPtr const& api) } void osc::DrawOpenModelButtonWithRecentFilesDropdown( - std::function)> const& onUserClickedOpenOrSelectedFile) + const std::function)>& onUserClickedOpenOrSelectedFile) { ui::push_style_var(ImGuiStyleVar_ItemSpacing, {2.0f, 0.0f}); if (ui::draw_button(ICON_FA_FOLDER_OPEN)) @@ -1329,7 +1329,7 @@ void osc::DrawOpenModelButtonWithRecentFilesDropdown( } } -void osc::DrawOpenModelButtonWithRecentFilesDropdown(ParentPtr const& api) +void osc::DrawOpenModelButtonWithRecentFilesDropdown(const ParentPtr& api) { DrawOpenModelButtonWithRecentFilesDropdown([&api](auto maybeFile) { @@ -1345,7 +1345,7 @@ void osc::DrawOpenModelButtonWithRecentFilesDropdown(ParentPtr } void osc::DrawSaveModelButton( - ParentPtr const& api, + const ParentPtr& api, UndoableModelStatePair& model) { if (ui::draw_button(ICON_FA_SAVE)) diff --git a/src/OpenSimCreator/UI/Shared/BasicWidgets.h b/src/OpenSimCreator/UI/Shared/BasicWidgets.h index 82eeb1ad4..255fb8c7d 100644 --- a/src/OpenSimCreator/UI/Shared/BasicWidgets.h +++ b/src/OpenSimCreator/UI/Shared/BasicWidgets.h @@ -60,11 +60,11 @@ namespace osc ); bool DrawRequestOutputMenuOrMenuItem( const OpenSim::AbstractOutput& o, - std::function)> const& onUserSelection + const std::function)>& onUserSelection ); bool DrawWatchOutputMenu( const OpenSim::Component&, - std::function)> const& onUserSelection + const std::function)>& onUserSelection ); void DrawSimulationParams( const ParamBlock& @@ -83,7 +83,7 @@ namespace osc // (i.e. `ui::begin_menu($FRAME)` returned `true`) void DrawWithRespectToMenuContainingMenuPerFrame( const OpenSim::Component& root, - std::function const& onFrameMenuOpened, + const std::function& onFrameMenuOpened, const OpenSim::Frame* maybeParent ); @@ -94,7 +94,7 @@ namespace osc // associated with a frame void DrawWithRespectToMenuContainingMenuItemPerFrame( const OpenSim::Component& root, - std::function const& onFrameMenuItemClicked, + const std::function& onFrameMenuItemClicked, const OpenSim::Frame* maybeParent ); @@ -235,13 +235,13 @@ namespace osc ModelRendererParams&, std::span, IconCache&, - std::function const& drawExtraElements = []() { return false; } + const std::function& drawExtraElements = []() { return false; } ); bool DrawCameraControlButtons( ModelRendererParams&, std::span, const Rect&, - std::optional const& maybeSceneAABB, + const std::optional& maybeSceneAABB, IconCache&, Vec2 desiredTopCentroid ); @@ -251,17 +251,17 @@ namespace osc std::optional, const Rect&, IconCache&, - std::function const& drawExtraElementsInTop = []() { return false; } + const std::function& drawExtraElementsInTop = []() { return false; } ); // toolbar stuff bool BeginToolbar(CStringView label, std::optional padding = {}); // behaves the same as `ui::begin_panel` (i.e. you must call `ui::end_panel`) - void DrawNewModelButton(ParentPtr const&); + void DrawNewModelButton(const ParentPtr&); void DrawOpenModelButtonWithRecentFilesDropdown( - std::function)> const& onUserClickedOpenOrSelectedFile + const std::function)>& onUserClickedOpenOrSelectedFile ); - void DrawOpenModelButtonWithRecentFilesDropdown(ParentPtr const&); - void DrawSaveModelButton(ParentPtr const&, UndoableModelStatePair&); + void DrawOpenModelButtonWithRecentFilesDropdown(const ParentPtr&); + void DrawSaveModelButton(const ParentPtr&, UndoableModelStatePair&); void DrawReloadModelButton(UndoableModelStatePair&); void DrawUndoButton(UndoableModelStatePair&); void DrawRedoButton(UndoableModelStatePair&); diff --git a/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayer.cpp b/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayer.cpp index 54ef8dd65..80f4382f6 100644 --- a/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayer.cpp +++ b/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayer.cpp @@ -208,7 +208,7 @@ class osc::ChooseComponentsEditorLayer::Impl final { // do hovertest if (layerIsHovered) { - std::optional const collision = GetClosestCollision( + const std::optional collision = GetClosestCollision( m_Decorations.bvh, *m_State.meshCache, m_Decorations.decorations, diff --git a/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayerParameters.h b/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayerParameters.h index 53bdb3524..5b1e32813 100644 --- a/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayerParameters.h +++ b/src/OpenSimCreator/UI/Shared/ChooseComponentsEditorLayerParameters.h @@ -27,7 +27,7 @@ namespace osc size_t numComponentsUserMustChoose = 1; - std::function const&)> onUserFinishedChoosing = [](std::unordered_set const&) + std::function&)> onUserFinishedChoosing = [](const std::unordered_set&) { return true; }; diff --git a/src/OpenSimCreator/UI/Shared/GeometryPathEditorPopup.cpp b/src/OpenSimCreator/UI/Shared/GeometryPathEditorPopup.cpp index 91b8b6c3c..17ff34813 100644 --- a/src/OpenSimCreator/UI/Shared/GeometryPathEditorPopup.cpp +++ b/src/OpenSimCreator/UI/Shared/GeometryPathEditorPopup.cpp @@ -26,7 +26,7 @@ namespace constexpr auto c_LocationInputIDs = std::to_array({ "##xinput", "##yinput", "##zinput" }); static_assert(c_LocationInputIDs.size() == 3); - OpenSim::GeometryPath CopyOrDefaultGeometryPath(std::function const& accessor) + OpenSim::GeometryPath CopyOrDefaultGeometryPath(const std::function& accessor) { const OpenSim::GeometryPath* maybeGeomPath = accessor(); if (maybeGeomPath) @@ -370,8 +370,6 @@ class osc::GeometryPathEditorPopup::Impl final : public StandardPopup { }; -// public API (PIMPL) - osc::GeometryPathEditorPopup::GeometryPathEditorPopup( std::string_view popupName_, std::shared_ptr targetModel_, @@ -379,8 +377,7 @@ osc::GeometryPathEditorPopup::GeometryPathEditorPopup( std::function onLocalCopyEdited_) : m_Impl{std::make_unique(popupName_, std::move(targetModel_), std::move(geometryPathGetter_), std::move(onLocalCopyEdited_))} -{ -} +{} osc::GeometryPathEditorPopup::GeometryPathEditorPopup(GeometryPathEditorPopup&&) noexcept = default; osc::GeometryPathEditorPopup& osc::GeometryPathEditorPopup::operator=(GeometryPathEditorPopup&&) noexcept = default; osc::GeometryPathEditorPopup::~GeometryPathEditorPopup() noexcept = default; diff --git a/src/OpenSimCreator/UI/Shared/MainMenu.cpp b/src/OpenSimCreator/UI/Shared/MainMenu.cpp index 3f95575ed..b7c0c1129 100644 --- a/src/OpenSimCreator/UI/Shared/MainMenu.cpp +++ b/src/OpenSimCreator/UI/Shared/MainMenu.cpp @@ -50,7 +50,7 @@ osc::MainMenuFileTab::MainMenuFileTab() : } void osc::MainMenuFileTab::onDraw( - ParentPtr const& api, + const ParentPtr& api, UndoableModelStatePair* maybeModel) { // handle hotkeys enabled by just drawing the menu diff --git a/src/OpenSimCreator/UI/Shared/MainMenu.h b/src/OpenSimCreator/UI/Shared/MainMenu.h index 33cc8c14a..5762ae972 100644 --- a/src/OpenSimCreator/UI/Shared/MainMenu.h +++ b/src/OpenSimCreator/UI/Shared/MainMenu.h @@ -16,7 +16,7 @@ namespace osc public: MainMenuFileTab(); - void onDraw(ParentPtr const&, UndoableModelStatePair* = nullptr); + void onDraw(const ParentPtr&, UndoableModelStatePair* = nullptr); std::vector exampleOsimFiles; std::optional maybeSaveChangesPopup; diff --git a/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelParameters.h b/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelParameters.h index cc52d0b12..35c35f20c 100644 --- a/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelParameters.h +++ b/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelParameters.h @@ -16,12 +16,11 @@ namespace osc public: ModelEditorViewerPanelParameters( std::shared_ptr model_, - std::function const& onRightClickedAComponent_) : + const std::function& onRightClickedAComponent_) : m_Model{std::move(model_)}, m_OnRightClickedAComponent{onRightClickedAComponent_} - { - } + {} std::shared_ptr getModelSharedPtr() { return m_Model; } void callOnRightClickHandler(const ModelEditorViewerPanelRightClickEvent& e) { m_OnRightClickedAComponent(e); } diff --git a/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelRightClickEvent.h b/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelRightClickEvent.h index 68ffa282d..75613f3f6 100644 --- a/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelRightClickEvent.h +++ b/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelRightClickEvent.h @@ -21,8 +21,7 @@ namespace osc viewportScreenRect{viewportScreenRect_}, componentAbsPathOrEmpty{std::move(componentAbsPathOrEmpty_)}, maybeClickPositionInGround{maybeClickPositionInGround_} - { - } + {} std::string sourcePanelName; Rect viewportScreenRect; diff --git a/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelState.cpp b/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelState.cpp index 2598c466b..16fa21e98 100644 --- a/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelState.cpp +++ b/src/OpenSimCreator/UI/Shared/ModelEditorViewerPanelState.cpp @@ -11,5 +11,4 @@ osc::ModelEditorViewerPanelState::ModelEditorViewerPanelState( { App::singleton(App::resource_loader()), } -{ -} +{} diff --git a/src/OpenSimCreator/UI/Shared/ModelSelectionGizmo.cpp b/src/OpenSimCreator/UI/Shared/ModelSelectionGizmo.cpp index 7f154b410..97846bfa0 100644 --- a/src/OpenSimCreator/UI/Shared/ModelSelectionGizmo.cpp +++ b/src/OpenSimCreator/UI/Shared/ModelSelectionGizmo.cpp @@ -628,7 +628,7 @@ namespace const Rect& viewportRect, ImGuizmo::OPERATION operation, ImGuizmo::MODE mode, - std::shared_ptr const& model, + const std::shared_ptr& model, const OpenSim::Component& selected, bool& wasUsingLastFrameStorage) { @@ -667,9 +667,7 @@ namespace osc::ModelSelectionGizmo::ModelSelectionGizmo(std::shared_ptr model_) : m_Model{std::move(model_)} -{ -} - +{} osc::ModelSelectionGizmo::ModelSelectionGizmo(const ModelSelectionGizmo&) = default; osc::ModelSelectionGizmo::ModelSelectionGizmo(ModelSelectionGizmo&&) noexcept = default; osc::ModelSelectionGizmo& osc::ModelSelectionGizmo::operator=(const ModelSelectionGizmo&) = default; diff --git a/src/OpenSimCreator/UI/Shared/NavigatorPanel.cpp b/src/OpenSimCreator/UI/Shared/NavigatorPanel.cpp index 1ffbb5415..920123f04 100644 --- a/src/OpenSimCreator/UI/Shared/NavigatorPanel.cpp +++ b/src/OpenSimCreator/UI/Shared/NavigatorPanel.cpp @@ -42,54 +42,66 @@ namespace static_assert(N <= std::numeric_limits::max()); public: - void push_back(T v) { + void push_back(T v) + { if (m_Size >= N) { throw std::runtime_error{"cannot render a navigator: the Model/Component tree is too deep"}; } m_Data[m_Size++] = v; } - T const* begin() const { + const T* begin() const + { return m_Data.data(); } - T* begin() { + T* begin() + { return m_Data.data(); } - T const* end() const { + const T* end() const + { return m_Data.data() + m_Size; } - T* end() { + T* end() + { return m_Data.data() + m_Size; } - size_t size() const { + size_t size() const + { return m_Size; } - ptrdiff_t sizei() const { + ptrdiff_t sizei() const + { return static_cast(m_Size); } - bool empty() const { + bool empty() const + { return m_Size == 0; } - void resize(size_t newsize) { + void resize(size_t newsize) + { m_Size = newsize; } - void clear() { + void clear() + { m_Size = 0; } - T& operator[](size_t idx) { + T& operator[](size_t idx) + { return m_Data[idx]; } - T const& operator[](size_t i) const { + const T& operator[](size_t i) const + { return m_Data[i]; } @@ -399,17 +411,13 @@ class osc::NavigatorPanel::Impl final : public StandardPanelImpl { }; -// public API (PIMPL) - osc::NavigatorPanel::NavigatorPanel( std::string_view panelName, std::shared_ptr model, std::function onRightClick) : m_Impl{std::make_unique(panelName, std::move(model), std::move(onRightClick))} -{ -} - +{} osc::NavigatorPanel::NavigatorPanel(NavigatorPanel&&) noexcept = default; osc::NavigatorPanel& osc::NavigatorPanel::operator=(NavigatorPanel&&) noexcept = default; osc::NavigatorPanel::~NavigatorPanel() noexcept = default; diff --git a/src/OpenSimCreator/UI/Shared/ObjectPropertiesEditor.cpp b/src/OpenSimCreator/UI/Shared/ObjectPropertiesEditor.cpp index 1de0c5555..e3f570ef9 100644 --- a/src/OpenSimCreator/UI/Shared/ObjectPropertiesEditor.cpp +++ b/src/OpenSimCreator/UI/Shared/ObjectPropertiesEditor.cpp @@ -800,7 +800,7 @@ namespace return std::nullopt; // the component doesn't have a logical positional property that can be edited with the transform } - OpenSim::Property const* const prop = tryGetProperty(); + const OpenSim::Property* const prop = tryGetProperty(); if (!prop) { return std::nullopt; // can't access the property this editor is ultimately editing @@ -843,8 +843,8 @@ namespace conversionCoefficient = static_cast(SimTK_RADIAN_TO_DEGREE); } - std::optional const parent2ground = getParentToGroundTransform(); - std::optional const ground2frame = getGroundToUserSelectedFrameTransform(); + const std::optional parent2ground = getParentToGroundTransform(); + const std::optional ground2frame = getGroundToUserSelectedFrameTransform(); const SimTK::Transform transform = parent2ground && ground2frame ? (*ground2frame) * (*parent2ground) : SimTK::Transform{}; diff --git a/src/OpenSimCreator/UI/Shared/Readonly3DModelViewer.cpp b/src/OpenSimCreator/UI/Shared/Readonly3DModelViewer.cpp index 11aea8e03..2152a5db8 100644 --- a/src/OpenSimCreator/UI/Shared/Readonly3DModelViewer.cpp +++ b/src/OpenSimCreator/UI/Shared/Readonly3DModelViewer.cpp @@ -205,12 +205,9 @@ class osc::Readonly3DModelViewer::Impl final { }; -// public API (PIMPL) - osc::Readonly3DModelViewer::Readonly3DModelViewer(std::string_view parentPanelName_, Readonly3DModelViewerFlags flags_) : m_Impl{std::make_unique(parentPanelName_, flags_)} -{ -} +{} osc::Readonly3DModelViewer::Readonly3DModelViewer(Readonly3DModelViewer&&) noexcept = default; osc::Readonly3DModelViewer& osc::Readonly3DModelViewer::operator=(Readonly3DModelViewer&&) noexcept = default; osc::Readonly3DModelViewer::~Readonly3DModelViewer() noexcept = default; diff --git a/src/OpenSimCreator/UI/Simulation/ModelStatePairContextMenu.cpp b/src/OpenSimCreator/UI/Simulation/ModelStatePairContextMenu.cpp index 7c57fa174..fd29e2a19 100644 --- a/src/OpenSimCreator/UI/Simulation/ModelStatePairContextMenu.cpp +++ b/src/OpenSimCreator/UI/Simulation/ModelStatePairContextMenu.cpp @@ -94,9 +94,7 @@ osc::ModelStatePairContextMenu::ModelStatePairContextMenu( std::optional maybeComponentAbsPath_) : m_Impl{std::make_unique(panelName_, std::move(model_), api_, std::move(maybeComponentAbsPath_))} -{ -} - +{} osc::ModelStatePairContextMenu::ModelStatePairContextMenu(ModelStatePairContextMenu&&) noexcept = default; osc::ModelStatePairContextMenu& osc::ModelStatePairContextMenu::operator=(ModelStatePairContextMenu&&) noexcept = default; osc::ModelStatePairContextMenu::~ModelStatePairContextMenu() noexcept = default; diff --git a/src/OpenSimCreator/UI/Simulation/SimulationViewerPanel.cpp b/src/OpenSimCreator/UI/Simulation/SimulationViewerPanel.cpp index b29eeb243..9a6a278e5 100644 --- a/src/OpenSimCreator/UI/Simulation/SimulationViewerPanel.cpp +++ b/src/OpenSimCreator/UI/Simulation/SimulationViewerPanel.cpp @@ -92,8 +92,6 @@ class osc::SimulationViewerPanel::Impl final : public StandardPanelImpl { }; -// public API - osc::SimulationViewerPanel::SimulationViewerPanel( std::string_view panelName_, SimulationViewerPanelParameters params_) : diff --git a/src/OpenSimCreator/Utils/OpenSimHelpers.h b/src/OpenSimCreator/Utils/OpenSimHelpers.h index 639d849ec..a6066da85 100644 --- a/src/OpenSimCreator/Utils/OpenSimHelpers.h +++ b/src/OpenSimCreator/Utils/OpenSimHelpers.h @@ -161,7 +161,7 @@ namespace osc } template - T const& At(const OpenSim::Property& p, size_t i) + const T& At(const OpenSim::Property& p, size_t i) { return p[static_cast(i)]; } @@ -269,7 +269,7 @@ namespace osc void ForEachComponent(const OpenSim::Component&, const std::function&); // calls the given function with the provided component and each of its subcomponents - void ForEachComponentInclusive(const OpenSim::Component&, const std::function&); + void ForEachComponentInclusive(const OpenSim::Component&, const std::function&); // returns the number of children (recursive) of type T under the given component template T> diff --git a/src/OpenSimCreator/Utils/ParamBlock.cpp b/src/OpenSimCreator/Utils/ParamBlock.cpp index 8e5187d92..bf3be60de 100644 --- a/src/OpenSimCreator/Utils/ParamBlock.cpp +++ b/src/OpenSimCreator/Utils/ParamBlock.cpp @@ -132,8 +132,6 @@ class osc::ParamBlock::Impl final { }; -// public API - osc::ParamBlock::ParamBlock() : m_Impl{std::make_unique()} {} osc::ParamBlock::ParamBlock(const ParamBlock&) = default; osc::ParamBlock::ParamBlock(ParamBlock&&) noexcept = default; diff --git a/src/OpenSimCreator/Utils/ShapeFitters.cpp b/src/OpenSimCreator/Utils/ShapeFitters.cpp index 13948b5c5..720354c03 100644 --- a/src/OpenSimCreator/Utils/ShapeFitters.cpp +++ b/src/OpenSimCreator/Utils/ShapeFitters.cpp @@ -679,7 +679,7 @@ Ellipsoid osc::FitEllipsoid(const Mesh& mesh) const auto A = CalcA(v); // form the algebraic form of the ellipsoid // solve for ellipsoid origin - auto const ellipsoidOrigin = CalcEllipsoidOrigin(A, v); + const auto ellipsoidOrigin = CalcEllipsoidOrigin(A, v); // use Eigenanalysis to solve for the ellipsoid's radii and and frame auto [evecs, evals] = SolveEigenProblem(A, ellipsoidOrigin); diff --git a/src/OpenSimCreator/Utils/SimTKHelpers.cpp b/src/OpenSimCreator/Utils/SimTKHelpers.cpp index 8ff6944bb..80c865cc2 100644 --- a/src/OpenSimCreator/Utils/SimTKHelpers.cpp +++ b/src/OpenSimCreator/Utils/SimTKHelpers.cpp @@ -14,8 +14,6 @@ using namespace osc; -// public API - SimTK::Vec3 osc::ToSimTKVec3(const Vec3& v) { return {