Merge branch 'main' into feature_lua-scripting-engine-prototype

.gitmodules

@@ -31,9 +31,6 @@
 [submodule "third_party/lunasvg"]
 	path = third_party/lunasvg
 	url = https://github.com/ComputationalBiomechanicsLab/lunasvg
-[submodule "third_party/benchmark"]
-	path = third_party/benchmark
-	url = https://github.com/ComputationalBiomechanicsLab/benchmark
 [submodule "third_party/unordered_dense"]
 	path = third_party/unordered_dense
 	url = https://github.com/ComputationalBiomechanicsLab/unordered_dense

CHANGELOG.md

@@ -5,9 +5,14 @@ on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Upcoming Release]
 
+- The model editor UI now has experimental support for viewing `OpenSim::Function` curves. This
+  is currently exposed as an eye icon in the property editor panel
 - Selecting an `OpenSim::Joint` that has `OpenSim::PhysicalOffsetFrame`s for both its parent
   and child frames now shows a 3D manipulation gizmo that lets you move the joint center
   without moving anything else in the model (#159)
+- Manipulating a child offset frame of a `OpenSim::Joint` should now work correctly for both
+  translation and rotation, allowing you visually place the parent of the child offset frame
+  (e.g. a body) that's moved by the joint
 - The UI now remembers which panels (e.g. Log, Properties) you had open between boots (#17)
 - The mesh warping tab now has a `Visualization Options` menu, which lets users toggle a few
   basic visualization options (e.g. grid lines, #892)
@@ -36,6 +41,8 @@ on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Internal: Added barebones `TemporaryFile` class (handy for testing IO-related code)
 - Internal: `ImGuizmo` was mostly refactored into an internal concern, with OSC using an
   easier-to-integrate wrapper class
+- Internal: `benchmarks/` were dropped (unused: microbenchmarks are better-suited to
+  `opensim-core`)
 
 
 ## [0.5.12] - 2024/04/29

CMakeLists.txt

@@ -14,11 +14,6 @@ set(
     CACHE BOOL
     "enable/disable building the documentation (requires that sphinx-build is available on the PATH)"
 )
-set(
-    OSC_BUILD_BENCHMARKS ON
-    CACHE BOOL
-    "enable/disable building the benchmark suite (handy for development)"
-)
 set(
     OSC_EMSCRIPTEN OFF
     CACHE BOOL
@@ -68,7 +63,3 @@ add_subdirectory(tests)
 if(${OSC_BUILD_DOCS})
     add_subdirectory(docs)
 endif()
-
-if(${OSC_BUILD_BENCHMARKS})
-    add_subdirectory(benchmarks)
-endif()

scripts/build_emscripten.sh

@@ -8,6 +8,15 @@
 
 set -xeuo pipefail
 
+# "base" build type to use when build types haven't been specified
+OSC_BASE_BUILD_TYPE=${OSC_BASE_BUILD_TYPE:-Release}
+
+# build type for all of OSC's dependencies
+OSC_DEPS_BUILD_TYPE=${OSC_DEPS_BUILD_TYPE:-`echo ${OSC_BASE_BUILD_TYPE}`}
+
+# build type for OSC
+OSC_BUILD_TYPE=${OSC_BUILD_TYPE-`echo ${OSC_BASE_BUILD_TYPE}`}
+
 # install emsdk
 if [ ! -d emsdk ]; then
      git clone https://github.com/emscripten-core/emsdk.git
@@ -25,10 +34,10 @@ source ./emsdk/emsdk_env.sh
 # - this is a custom build for now because I can't build all dependencies
 #   with emsdk yet
 
-CXXFLAGS="-fexceptions" emcmake cmake -S third_party/ -B osc-deps-build -DOSCDEPS_GET_BENCHMARK=OFF -DOSCDEPS_GET_SDL=OFF -DOSCDEPS_GET_GLEW=OFF -DOSCDEPS_GET_NATIVEFILEDIALOG=OFF -DOSCDEPS_GET_OPENSIM=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/osc-deps-install -DCMAKE_INSTALL_LIBDIR=${PWD}/osc-deps-install/lib
+CXXFLAGS="-fexceptions" emcmake cmake -S third_party/ -B osc-deps-build -DOSCDEPS_GET_BENCHMARK=OFF -DOSCDEPS_GET_SDL=OFF -DOSCDEPS_GET_GLEW=OFF -DOSCDEPS_GET_NATIVEFILEDIALOG=OFF -DOSCDEPS_GET_OPENSIM=OFF -DCMAKE_INSTALL_PREFIX=${PWD}/osc-deps-install -DCMAKE_INSTALL_LIBDIR=${PWD}/osc-deps-install/lib -DCMAKE_BUILD_TYPE=${OSC_DEPS_BUILD_TYPE}
 emmake cmake --build osc-deps-build -j$(nproc) -v
 
-LDFLAGS="-fexceptions -sNO_DISABLE_EXCEPTION_CATCHING=1 -sUSE_WEBGL2=1 -sMIN_WEBGL_VERSION=2 -sFULL_ES2=1 -sFULL_ES3=1 -sUSE_SDL=2" CXXFLAGS="-fexceptions --use-port=sdl2" emcmake cmake -S . -B osc-build -DOSC_BUILD_OPENSIMCREATOR=OFF -DOSC_DISCOVER_TESTS=OFF -DOSC_EMSCRIPTEN=ON -DCMAKE_PREFIX_PATH=${PWD}/osc-deps-install -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH
+LDFLAGS="-fexceptions -sNO_DISABLE_EXCEPTION_CATCHING=1 -sUSE_WEBGL2=1 -sMIN_WEBGL_VERSION=2 -sFULL_ES2=1 -sFULL_ES3=1 -sUSE_SDL=2" CXXFLAGS="-fexceptions --use-port=sdl2" emcmake cmake -S . -B osc-build -DOSC_BUILD_OPENSIMCREATOR=OFF -DOSC_DISCOVER_TESTS=OFF -DOSC_EMSCRIPTEN=ON -DCMAKE_PREFIX_PATH=${PWD}/osc-deps-install -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH -DCMAKE_BUILD_TYPE=${OSC_BUILD_TYPE}
 emmake cmake --build osc-build --target testoscar -v -j$(nproc)
 emmake cmake --build osc-build --target hellotriangle -v -j$(nproc)
 

scripts/build_windows.py

@@ -30,7 +30,7 @@ class BuildConfiguration:
     def __init__(
             self,
             *,
-            base_build_type="RelWithDebInfo",
+            base_build_type="Release",
             build_dir=os.curdir,
             build_concurrency=multiprocessing.cpu_count(),
             build_target="package",

src/OpenSimCreator/CMakeLists.txt

@@ -328,6 +328,8 @@ add_library(OpenSimCreator STATIC
     UI/Shared/ChooseComponentsEditorLayer.cpp
     UI/Shared/ChooseComponentsEditorLayer.h
     UI/Shared/ChooseComponentsEditorLayerParameters.h
+    UI/Shared/FunctionCurveViewerPopup.cpp
+    UI/Shared/FunctionCurveViewerPopup.h
     UI/Shared/GeometryPathEditorPopup.cpp
     UI/Shared/GeometryPathEditorPopup.h
     UI/Shared/ImportStationsFromCSVPopup.cpp
@@ -409,7 +411,7 @@ add_library(OpenSimCreator STATIC
     Utils/SimTKHelpers.h
     Utils/TPS3D.cpp
     Utils/TPS3D.h
- )
+)
 
 target_include_directories(OpenSimCreator PUBLIC
 

src/OpenSimCreator/Documents/MeshImporter/MIObject.cpp

@@ -8,7 +8,7 @@ namespace rgs = std::ranges;
 
 void osc::mi::MIObject::applyRotation(
     const IObjectFinder& lookup,
-    const Eulers& eulerAngles,
+    const EulerAngles& eulerAngles,
     const Vec3& rotationCenter)
 {
     Transform t = getXForm(lookup);

src/OpenSimCreator/Documents/MeshImporter/MIObject.h

@@ -6,7 +6,7 @@
 #include <OpenSimCreator/Documents/MeshImporter/MIVariant.h>
 
 #include <oscar/Maths/AABB.h>
-#include <oscar/Maths/Eulers.h>
+#include <oscar/Maths/EulerAngles.h>
 #include <oscar/Maths/Quat.h>
 #include <oscar/Maths/Transform.h>
 #include <oscar/Maths/Vec3.h>
@@ -149,7 +149,7 @@ namespace osc::mi
 
         void applyRotation(
             const IObjectFinder& lookup,
-            const Eulers& eulerAngles,
+            const EulerAngles& eulerAngles,
             const Vec3& rotationCenter
         );
 

src/OpenSimCreator/Documents/Model/UndoableModelActions.cpp

@@ -1934,7 +1934,7 @@ bool osc::ActionTransformPof(
     UndoableModelStatePair& model,
     const OpenSim::PhysicalOffsetFrame& pof,
     const Vec3& deltaTranslationInParentFrame,
-    const Eulers& newPofEulers)
+    const EulerAngles& newPofEulers)
 {
     const OpenSim::ComponentPath pofPath = GetAbsolutePath(pof);
     const UID oldVersion = model.getModelVersion();
@@ -1973,7 +1973,7 @@ bool osc::ActionTransformPofV2(
     UndoableModelStatePair& model,
     const OpenSim::PhysicalOffsetFrame& pof,
     const Vec3& newTranslation,
-    const Eulers& newEulers)
+    const EulerAngles& newEulers)
 {
     const OpenSim::ComponentPath pofPath = GetAbsolutePath(pof);
     const UID oldVersion = model.getModelVersion();
@@ -2009,7 +2009,7 @@ bool osc::ActionTransformWrapObject(
     UndoableModelStatePair& model,
     const OpenSim::WrapObject& wo,
     const Vec3& deltaPosition,
-    const Eulers& newEulers)
+    const EulerAngles& newEulers)
 {
     const OpenSim::ComponentPath pofPath = GetAbsolutePath(wo);
     const UID oldVersion = model.getModelVersion();
@@ -2048,7 +2048,7 @@ bool osc::ActionTransformContactGeometry(
     UndoableModelStatePair& model,
     const OpenSim::ContactGeometry& contactGeom,
     const Vec3& deltaPosition,
-    const Eulers& newEulers)
+    const EulerAngles& newEulers)
 {
     const OpenSim::ComponentPath pofPath = GetAbsolutePath(contactGeom);
     const UID oldVersion = model.getModelVersion();

src/OpenSimCreator/Documents/Model/UndoableModelActions.h

@@ -2,7 +2,7 @@
 
 #include <OpenSimCreator/Documents/Landmarks/NamedLandmark.h>
 
-#include <oscar/Maths/Eulers.h>
+#include <oscar/Maths/EulerAngles.h>
 #include <oscar/Maths/Vec3.h>
 #include <oscar/Shims/Cpp23/utility.h>
 
@@ -415,28 +415,28 @@ namespace osc
         UndoableModelStatePair&,
         const OpenSim::PhysicalOffsetFrame&,
         const Vec3& deltaTranslationInParentFrame,
-        const Eulers& newPofEulers
+        const EulerAngles& newPofEulers
     );
 
     bool ActionTransformPofV2(
         UndoableModelStatePair&,
         const OpenSim::PhysicalOffsetFrame&,
         const Vec3& newTranslation,
-        const Eulers& newEulers
+        const EulerAngles& newEulers
     );
 
     bool ActionTransformWrapObject(
         UndoableModelStatePair&,
         const OpenSim::WrapObject&,
         const Vec3& deltaPosition,
-        const Eulers& newEulers
+        const EulerAngles& newEulers
     );
 
     bool ActionTransformContactGeometry(
         UndoableModelStatePair&,
         const OpenSim::ContactGeometry&,
         const Vec3& deltaPosition,
-        const Eulers& newEulers
+        const EulerAngles& newEulers
     );
 
     bool ActionFitSphereToMesh(

src/OpenSimCreator/UI/Experimental/RendererGeometryShaderTab.cpp

@@ -10,7 +10,7 @@
 #include <oscar/Graphics/Mesh.h>
 #include <oscar/Graphics/Shader.h>
 #include <oscar/Maths/Angle.h>
-#include <oscar/Maths/Eulers.h>
+#include <oscar/Maths/EulerAngles.h>
 #include <oscar/Maths/MathHelpers.h>
 #include <oscar/Maths/Transform.h>
 #include <oscar/Maths/Vec3.h>
@@ -118,7 +118,7 @@ class osc::RendererGeometryShaderTab::Impl final {
     Mesh m_Mesh = LoadMeshViaSimTK(App::resource_filepath("geometry/hat_ribs_scap.vtp"));
     Camera m_SceneCamera;
     bool m_IsMouseCaptured = false;
-    Eulers m_CameraEulers = {};
+    EulerAngles m_CameraEulers = {};
     Color m_MeshColor = Color::white();
 };
 

src/OpenSimCreator/UI/Experimental/TPS2DTab.cpp

@@ -292,7 +292,7 @@ namespace
     Mesh ApplyThinPlateWarpToMesh(const ThinPlateWarper2D& t, const Mesh& mesh)
     {
         Mesh rv = mesh;
-        rv.transform_vertices([&t](Vec3 v) { return Vec3{t.transform(v), v.z}; });
+        rv.transform_vertices([&t](Vec3 v) { return Vec3{t.transform(Vec2{v}), v.z}; });
         return rv;
     }
 }