alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-24 08:41:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from gwilymk/improve-affine-matrix-syscall-arguments

Browse source 
Improve affine matrix syscall arguments
This commit is contained in:
Corwin 2021-06-05 20:48:26 +01:00 committed by GitHub
parent 361e9c93e6 46562e275c
commit ad16292cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
agb/src/syscall.rs
View file

@ -1,4 +1,5 @@
use crate::display::object::AffineMatrixAttributes; use crate::display::object::AffineMatrixAttributes;
use crate::number::Num;
#[allow(non_snake_case)] #[allow(non_snake_case)]
@ -105,7 +106,7 @@ pub fn arc_tan2(x: i16, y: i32) -> i16 {
result result
} }
pub fn affine_matrix(x_scale: i16, y_scale: i16, rotation: u16) -> AffineMatrixAttributes { pub fn affine_matrix(x_scale: Num<8>, y_scale: Num<8>, rotation: u8) -> AffineMatrixAttributes {
let mut result = AffineMatrixAttributes { let mut result = AffineMatrixAttributes {
p_a: 0, p_a: 0,
p_b: 0, p_b: 0,
@ -114,16 +115,19 @@ pub fn affine_matrix(x_scale: i16, y_scale: i16, rotation: u16) -> AffineMatrixA
}; };
#[allow(dead_code)] #[allow(dead_code)]
#[repr(C, packed)]
struct Input { struct Input {
x_scale: i16, x_scale: i16,
y_scale: i16, y_scale: i16,
rotation: u16, rotation: u16,
} }
let rotation_for_input = (rotation as u16) << 8;
let input = Input { let input = Input {
x_scale, y_scale: x_scale.to_raw() as i16,
y_scale, x_scale: y_scale.to_raw() as i16,
rotation, rotation: rotation_for_input,
}; };
unsafe { unsafe {
@ -141,7 +145,9 @@ pub fn affine_matrix(x_scale: i16, y_scale: i16, rotation: u16) -> AffineMatrixA
#[test_case] #[test_case]
fn affine(_gba: &mut crate::Gba) { fn affine(_gba: &mut crate::Gba) {
// expect identity matrix // expect identity matrix
let aff = affine_matrix(1 << 8, 1 << 8, 0); let one: Num<8> = 1.into();
assert_eq!(aff.p_a, 1 << 8);
assert_eq!(aff.p_d, 1 << 8); let aff = affine_matrix(one, one, 0);
assert_eq!(aff.p_a, one.to_raw() as i16);
assert_eq!(aff.p_d, one.to_raw() as i16);
} }