diff options
| author | Thierry Berger <contact@thierryberger.com> | 2024-11-12 09:02:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-12 09:02:55 +0100 |
| commit | 71f65fe55a5918a721252a1f7bb74531137ee665 (patch) | |
| tree | 9fc460a012f5846bb62651486a431eea192cebb4 /crates/rapier3d-meshloader | |
| parent | 0d791eb794d616c983145853e9c7594baef8f66c (diff) | |
| download | rapier-71f65fe55a5918a721252a1f7bb74531137ee665.tar.gz rapier-71f65fe55a5918a721252a1f7bb74531137ee665.tar.bz2 rapier-71f65fe55a5918a721252a1f7bb74531137ee665.zip | |
Use meshloader to support multiple file formats loading (#744)
Co-authored-by: Tin Lai <tin@tinyiu.com>
Diffstat (limited to 'crates/rapier3d-meshloader')
| -rw-r--r-- | crates/rapier3d-meshloader/CHANGELOG.md | 22 | ||||
| -rw-r--r-- | crates/rapier3d-meshloader/Cargo.toml | 31 | ||||
| -rw-r--r-- | crates/rapier3d-meshloader/LICENSE | 201 | ||||
| -rw-r--r-- | crates/rapier3d-meshloader/README.md | 22 | ||||
| -rw-r--r-- | crates/rapier3d-meshloader/src/lib.rs | 86 |
5 files changed, 362 insertions, 0 deletions
diff --git a/crates/rapier3d-meshloader/CHANGELOG.md b/crates/rapier3d-meshloader/CHANGELOG.md new file mode 100644 index 0000000..0663078 --- /dev/null +++ b/crates/rapier3d-meshloader/CHANGELOG.md @@ -0,0 +1,22 @@ +## Unreleased + +Renamed the crate from `rapier3d-stl` to `rapier3d-meshloader`, to better reflect its support for multiple formats. + +### Added + +- Add optional support for Collada and Wavefront files through new feature flags `collada` and `wavefront`. + +### Modified + +- Support for STL is now optional through feature `stl`. +- Features `stl`, `wavefront` and `collada` are enabled by default. + +## 0.3.0 + +This is the initial release of the `rapier3d-stl` crate. + +### Added + +- Add `load_from_path` for creating a shape from a stl file. +- Add `load_from_reader` for creating a shape from an object implementing `Read`. +- Add `load_from_raw_mesh` for creating a shape from an already loaded `IndexedMesh`. diff --git a/crates/rapier3d-meshloader/Cargo.toml b/crates/rapier3d-meshloader/Cargo.toml new file mode 100644 index 0000000..a470afc --- /dev/null +++ b/crates/rapier3d-meshloader/Cargo.toml @@ -0,0 +1,31 @@ +[package] +name = "rapier3d-meshloader" +version = "0.3.0" +authors = ["Sébastien Crozet <sebcrozet@dimforge.com>"] +description = "STL file loader for the 3D rapier physics engine." +documentation = "https://docs.rs/rapier3d-meshloader" +homepage = "https://rapier.rs" +repository = "https://github.com/dimforge/rapier" +readme = "README.md" +categories = [ + "science", + "game-development", + "mathematics", + "simulation", + "wasm", +] +keywords = ["physics", "joints", "multibody", "robotics", "urdf"] +license = "Apache-2.0" +edition = "2021" + +[features] +default = ["stl", "collada", "wavefront"] +stl = ["mesh-loader/stl"] +collada = ["mesh-loader/collada"] +wavefront = ["mesh-loader/obj"] + +[dependencies] +thiserror = "1.0.61" +mesh-loader = { version = "0.1.12", optional = true } + +rapier3d = { version = "0.22", path = "../rapier3d" } diff --git a/crates/rapier3d-meshloader/LICENSE b/crates/rapier3d-meshloader/LICENSE new file mode 100644 index 0000000..97f4383 --- /dev/null +++ b/crates/rapier3d-meshloader/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 Sébastien Crozet + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/crates/rapier3d-meshloader/README.md b/crates/rapier3d-meshloader/README.md new file mode 100644 index 0000000..003a7fa --- /dev/null +++ b/crates/rapier3d-meshloader/README.md @@ -0,0 +1,22 @@ +## Mesh loader for the Rapier physics engine + +Rapier is a set of 2D and 3D physics engines for games, animation, and robotics. The `rapier3d-meshloader` +crate lets you create a shape compatible with `rapier3d` and `parry3d` (the underlying collision-detection +library) from different file formats, see the following features list: + +- `stl`: support .stl files +- `collada`: support .dae files +- `wavefront`: support .obj files + +## Resources and discussions + +- [Dimforge](https://dimforge.com): See all the open-source projects we are working on! Follow our announcements + on our [blog](https://www.dimforge.com/blog). +- [User guide](https://www.rapier.rs/docs/): Learn to use Rapier in your project by reading the official User Guides. +- [Discord](https://discord.gg/vt9DJSW): Come chat with us, get help, suggest features, on Discord! +- [NPM packages](https://www.npmjs.com/search?q=%40dimforge): Check out our NPM packages for Rapier, if you need to + use it with JavaScript/Typescript. + +Please make sure to familiarize yourself with our [Code of Conduct](CODE_OF_CONDUCT.md) +and our [Contribution Guidelines](CONTRIBUTING.md) before contributing or participating in +discussions with the community. diff --git a/crates/rapier3d-meshloader/src/lib.rs b/crates/rapier3d-meshloader/src/lib.rs new file mode 100644 index 0000000..32051e5 --- /dev/null +++ b/crates/rapier3d-meshloader/src/lib.rs @@ -0,0 +1,86 @@ +#![doc = include_str!("../README.md")] +#![deny(missing_docs)] + +use mesh_loader::Mesh; +use rapier3d::geometry::{MeshConverter, SharedShape}; +use rapier3d::math::{Isometry, Point, Real, Vector}; +use rapier3d::prelude::MeshConverterError; +use std::path::Path; + +/// The result of loading a shape. +pub struct LoadedShape { + /// The shape loaded from the file and converted by the [`MeshConverter`]. + pub shape: SharedShape, + /// The shape’s pose. + pub pose: Isometry<Real>, + /// The raw mesh read from the file without any modification. + pub raw_mesh: Mesh, +} + +/// Error while loading an STL file. +#[derive(thiserror::Error, Debug)] +pub enum MeshLoaderError { + /// An error triggered by rapier’s [`MeshConverter`]. + #[error(transparent)] + MeshConverter(#[from] MeshConverterError), + /// A generic IO error. + #[error(transparent)] + Io(#[from] std::io::Error), +} + +/// Loads parry shapes from a file. +/// +/// # Parameters +/// - `path`: the file’s path. +/// - `converter`: controls how the shapes are computed from the content. In particular, it lets +/// you specify if the computed [`SharedShape`] is a triangle mesh, its convex hull, +/// bounding box, etc. +/// - `scale`: the scaling factor applied to the geometry input to the `converter`. This scale will +/// affect at the geometric level the [`LoadedShape::shape`]. Note that raw mesh value stored +/// in [`LoadedShape::raw_mesh`] remains unscaled. +pub fn load_from_path( + path: impl AsRef<Path>, + converter: &MeshConverter, + scale: Vector<Real>, +) -> Result<Vec<Result<LoadedShape, MeshConverterError>>, MeshLoaderError> { + let loader = mesh_loader::Loader::default(); + let mut colliders = vec![]; + let scene = loader.load(path)?; + for (raw_mesh, _) in scene.meshes.into_iter().zip(scene.materials) { + let shape = load_from_raw_mesh(&raw_mesh, converter, scale); + + colliders.push(shape.map(|(shape, pose)| LoadedShape { + shape, + pose, + raw_mesh, + })); + } + Ok(colliders) +} + +/// Loads an file as a shape from a preloaded raw [`mesh_loader::Mesh`]. +/// +/// # Parameters +/// - `raw_mesh`: the raw mesh. +/// - `converter`: controls how the shape is computed from the STL content. In particular, it lets +/// you specify if the computed [`SharedShape`] is a triangle mesh, its convex hull, +/// bounding box, etc. +/// - `scale`: the scaling factor applied to the geometry input to the `converter`. This scale will +/// affect at the geometric level the [`LoadedShape::shape`]. Note that raw mesh value stored +/// in [`LoadedShape::raw_mesh`] remains unscaled. +pub fn load_from_raw_mesh( + raw_mesh: &Mesh, + converter: &MeshConverter, + scale: Vector<Real>, +) -> Result<(SharedShape, Isometry<Real>), MeshConverterError> { + let mut vertices: Vec<_> = raw_mesh + .vertices + .iter() + .map(|xyz| Point::new(xyz[0], xyz[1], xyz[2])) + .collect(); + vertices + .iter_mut() + .for_each(|pt| pt.coords.component_mul_assign(&scale)); + let indices: Vec<_> = raw_mesh.faces.clone(); + converter.convert(vertices, indices) +} |
