Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ animation.rerun()
```

## From source
```conda install -c conda-forge ezc3d rerun-sdk=0.27.2 trimesh numpy biorbd pyomeca tk imageio imageio-ffmpeg trc-data-reader```
```conda install -c conda-forge ezc3d rerun-sdk=0.30.2 trimesh numpy biorbd pyomeca tk imageio imageio-ffmpeg trc-data-reader```

if you want to use the OpenSim, you also need to install separately:

Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
- ezc3d
- trc-data-reader>=0.4.0
- rerun-sdk=0.27.2
- rerun-sdk=0.30.2
- numpy
- matplotlib
- biorbd>=1.10.5
Expand Down
2 changes: 1 addition & 1 deletion pyorerun/model_components/ligaments.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ def to_rerun(self, q: np.ndarray) -> None:
rr.Transform3D(
translation=homogenous_matrices[:3, 3],
mat3x3=homogenous_matrices[:3, :3],
# axis_length=1,
),
rr.TransformAxes3D(1),
)
rr.log(
self.name,
Expand Down
6 changes: 3 additions & 3 deletions pyorerun/model_components/local_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ def nb_components(self):
def initialize(self):
rr.log(
self.name,
rr.Transform3D(
rr.Transform3D.from_fields(
translation=np.zeros(3),
mat3x3=np.eye(3),
axis_length=1,
),
rr.TransformAxes3D(1),
)

def to_rerun(self, q: np.ndarray) -> None:
rr.log(
self.name,
self.to_component(q),
rr.TransformAxes3D(self.scale),
)

def to_component(self, q: np.ndarray) -> rr.Transform3D:
homogenous_matrices = self.transform_callable(q)
return rr.Transform3D(
translation=homogenous_matrices[:3, 3],
mat3x3=homogenous_matrices[:3, :3],
axis_length=self.scale,
)

def compute_all_transforms(self, q: np.ndarray) -> np.ndarray:
Expand Down
4 changes: 2 additions & 2 deletions pyorerun/model_components/mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def to_chunk(self, q: np.ndarray) -> dict[str, list]:
*rr.Transform3D.columns(
translation=homogenous_matrices[:3, 3, :].T.tolist(),
mat3x3=[homogenous_matrices[:3, :3, f] for f in range(homogenous_matrices.shape[2])],
axis_length=[LOCAL_FRAME_SCALE] * homogenous_matrices.shape[2],
)
# axis_length=[LOCAL_FRAME_SCALE] * homogenous_matrices.shape[2],
),
]
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ classifiers = [
dependencies = [
"ezc3d", # Now needed, but imported for our custom PyoMarkers.from_c3d()
"numpy",
"rerun-sdk==0.27.2",
"rerun-sdk==0.30.2",
"trimesh",
"tk",
"imageio",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
install_requires=[
"ezc3d", # Not yet available on pypi, use `conda install -c conda-forge ezc3d`
"numpy",
"rerun-sdk==0.27.2",
"rerun-sdk==0.30.2",
"trimesh",
"tk",
"imageio",
Expand Down
Loading