OpenJam/libfj
1
0
Fork 0
Code Issues Pull requests Releases Activity

Add RC orientation conversion

Browse source
This commit is contained in:
NGnius (Graham) 2021-10-28 16:36:17 -04:00
parent a69c7c71c6
commit 2b1033449e
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "libfj" name = "libfj"
version = "0.6.0" version = "0.6.1"
authors = ["NGnius (Graham) <ngniusness@gmail.com>"] authors = ["NGnius (Graham) <ngniusness@gmail.com>"]
edition = "2018" edition = "2018"
description = "An unofficial collection of APIs used in FreeJam games and mods" description = "An unofficial collection of APIs used in FreeJam games and mods"

2
src/convert/mod.rs
View file

@ -5,4 +5,4 @@
#[cfg(feature = "robocraft")] #[cfg(feature = "robocraft")]
mod robocraft_3d; mod robocraft_3d;
#[cfg(feature = "robocraft")] #[cfg(feature = "robocraft")]
pub use robocraft_3d::{cubes_to_model, cubes_to_model_with_lut}; pub use robocraft_3d::{cubes_to_model, cubes_to_model_with_lut, cube_rotation_to_quat};

7
src/convert/robocraft_3d.rs
View file

@ -32,6 +32,11 @@ const ROTATIONS: [Euler<Deg<f32>>; 24] = [
Euler{x: Deg(-90.0), y: Deg(180.0), z: Deg(0.0)}, // 23 Euler{x: Deg(-90.0), y: Deg(180.0), z: Deg(0.0)}, // 23
]; ];
/// Convert a Robocraft robot's orientation enum into a physical rotation
pub fn cube_rotation_to_quat(orientation: u8) -> Quaternion<f32> {
ROTATIONS[orientation as usize].into()
}
/// Convert a Robocraft robot to a 3D model in Wavefront OBJ format. /// Convert a Robocraft robot to a 3D model in Wavefront OBJ format.
pub fn cubes_to_model(robot: robocraft::Cubes) -> obj::Obj { pub fn cubes_to_model(robot: robocraft::Cubes) -> obj::Obj {
cubes_to_model_with_lut(robot, default_model_lut) cubes_to_model_with_lut(robot, default_model_lut)
@ -47,7 +52,7 @@ pub fn cubes_to_model_with_lut<F: FnMut(u32) -> Vec<Quad<Vertex>>>(robot: robocr
// generate simple cube for every block // generate simple cube for every block
// TODO rotate blocks // TODO rotate blocks
let vertices = lut(cube.id); // Use lookup table to find correct id <-> block translation let vertices = lut(cube.id); // Use lookup table to find correct id <-> block translation
let rotation: Quaternion<_> = ROTATIONS[cube.orientation as usize].into(); let rotation: Quaternion<_> = cube_rotation_to_quat(cube.orientation);
positions.extend::<Vec::<[f32; 3]>>( positions.extend::<Vec::<[f32; 3]>>(
vertices.clone().into_iter().vertex(|v| vertices.clone().into_iter().vertex(|v|
{ {