lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2024-12-13 13:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert #85 to fix SIGSEGV

Browse source
This commit is contained in:
Filip Tibell 2023-08-23 12:07:16 -05:00
parent 83db30496d
commit 52a6c4f4da
No known key found for this signature in database
2 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/roblox/datatypes/types/cframe.rs
View file

@ -2,7 +2,7 @@ use core::fmt;
use std::ops; use std::ops;
use glam::{EulerRot, Mat4, Quat, Vec3}; use glam::{EulerRot, Mat4, Quat, Vec3};
use mlua::{prelude::*, Variadic}; use mlua::prelude::*;
use rbx_dom_weak::types::{CFrame as DomCFrame, Matrix3 as DomMatrix3, Vector3 as DomVector3}; use rbx_dom_weak::types::{CFrame as DomCFrame, Matrix3 as DomMatrix3, Vector3 as DomVector3};
use super::{super::*, Vector3}; use super::{super::*, Vector3};
@ -210,46 +210,38 @@ impl LuaUserData for CFrame {
translation, translation,
))) )))
}); });
methods.add_method( methods.add_method("ToWorldSpace", |_, this, rhs: LuaUserDataRef<CFrame>| {
"ToWorldSpace", Ok(*this * *rhs)
|_, this, rhs: Variadic<LuaUserDataRef<CFrame>>| { });
Ok(Variadic::from_iter(rhs.into_iter().map(|cf| *this * *cf))) methods.add_method("ToObjectSpace", |_, this, rhs: LuaUserDataRef<CFrame>| {
}, let inverse = this.inverse();
); Ok(inverse * *rhs)
methods.add_method( });
"ToObjectSpace",
|_, this, rhs: Variadic<LuaUserDataRef<CFrame>>| {
let inverse = this.inverse();
Ok(Variadic::from_iter(rhs.into_iter().map(|cf| inverse * *cf)))
},
);
methods.add_method( methods.add_method(
"PointToWorldSpace", "PointToWorldSpace",
|_, this, rhs: Variadic<LuaUserDataRef<Vector3>>| { |_, this, rhs: LuaUserDataRef<Vector3>| Ok(*this * *rhs),
Ok(Variadic::from_iter(rhs.into_iter().map(|v3| *this * *v3)))
},
); );
methods.add_method( methods.add_method(
"PointToObjectSpace", "PointToObjectSpace",
|_, this, rhs: Variadic<LuaUserDataRef<Vector3>>| { |_, this, rhs: LuaUserDataRef<Vector3>| {
let inverse = this.inverse(); let inverse = this.inverse();
Ok(Variadic::from_iter(rhs.into_iter().map(|v3| inverse * *v3))) Ok(inverse * *rhs)
}, },
); );
methods.add_method( methods.add_method(
"VectorToWorldSpace", "VectorToWorldSpace",
|_, this, rhs: Variadic<LuaUserDataRef<Vector3>>| { |_, this, rhs: LuaUserDataRef<Vector3>| {
let result = *this - Vector3(this.position()); let result = *this - Vector3(this.position());
Ok(Variadic::from_iter(rhs.into_iter().map(|v3| result * *v3))) Ok(result * *rhs)
}, },
); );
methods.add_method( methods.add_method(
"VectorToObjectSpace", "VectorToObjectSpace",
|_, this, rhs: Variadic<LuaUserDataRef<Vector3>>| { |_, this, rhs: LuaUserDataRef<Vector3>| {
let inverse = this.inverse(); let inverse = this.inverse();
let result = inverse - Vector3(inverse.position()); let result = inverse - Vector3(inverse.position());
Ok(Variadic::from_iter(rhs.into_iter().map(|v3| result * *v3))) Ok(result * *rhs)
}, },
); );
#[rustfmt::skip] #[rustfmt::skip]

8
tests/roblox/datatypes/CFrame.luau
View file

@ -99,18 +99,10 @@ assertEq(
-- World & object space conversions -- World & object space conversions
-- FIXME: ToWorldSpace and/or ToObjectSpace are causing SIGTRAP? What the heck?
if true then
return
end
local offset = CFrame.new(0, 0, -5) local offset = CFrame.new(0, 0, -5)
assert(offset:ToWorldSpace(offset).Z == offset.Z * 2) assert(offset:ToWorldSpace(offset).Z == offset.Z * 2)
assert(offset:ToObjectSpace(offset).Z == 0) assert(offset:ToObjectSpace(offset).Z == 0)
assert(select("#", offset:ToWorldSpace(offset, offset, offset)) == 3)
assert(select("#", offset:ToObjectSpace(offset, offset, offset)) == 3)
local world = CFrame.fromOrientation(0, math.rad(90), 0) * CFrame.new(0, 0, -5) local world = CFrame.fromOrientation(0, math.rad(90), 0) * CFrame.new(0, 0, -5)
local world2 = CFrame.fromOrientation(0, -math.rad(90), 0) * CFrame.new(0, 0, -5) local world2 = CFrame.fromOrientation(0, -math.rad(90), 0) * CFrame.new(0, 0, -5)
assertEq(CFrame.identity:ToObjectSpace(world), world) assertEq(CFrame.identity:ToObjectSpace(world), world)