luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2025-04-03 02:10:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add 2-component overload for vector.create

Browse source
This commit is contained in:
Petri Häkkinen 2024-12-16 12:09:00 +02:00
parent 1387f6d3e7
commit 7246c2ae89
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Compiler/src/BuiltinFolding.cpp
View file

@ -5,7 +5,7 @@
#include <math.h>
LUAU_FASTFLAGVARIABLE(LuauVector2Constructor)
LUAU_FASTFLAGVARIABLE(LuauVector2Constants)
namespace Luau
{
@ -475,7 +475,7 @@ Constant foldBuiltin(int bfid, const Constant* args, size_t count)
case LBF_VECTOR:
if (count >= 2 && args[0].type == Constant::Type_Number && args[1].type == Constant::Type_Number)
{
if (count == 2 && FFlag::LuauVector2Constructor)
if (count == 2 && FFlag::LuauVector2Constants)
return cvector(args[0].valueNumber, args[1].valueNumber, 0.0, 0.0);
else if (count == 3 && args[2].type == Constant::Type_Number)
return cvector(args[0].valueNumber, args[1].valueNumber, args[2].valueNumber, 0.0);

9
VM/src/lveclib.cpp
View file

@ -7,16 +7,19 @@
#include <math.h>
LUAU_FASTFLAGVARIABLE(LuauVectorMetatable)
LUAU_FASTFLAGVARIABLE(LuauVector2Constructor)
static int vector_create(lua_State* L)
{
// checking argument count to avoid accepting 'nil' as a valid value
int count = lua_gettop(L);
double x = luaL_checknumber(L, 1);
double y = luaL_checknumber(L, 2);
double z = luaL_checknumber(L, 3);
double z = FFlag::LuauVector2Constructor ? (count >= 3 ? luaL_checknumber(L, 3) : 0.0) : luaL_checknumber(L, 3);
#if LUA_VECTOR_SIZE == 4
// checking argument count to avoid accepting 'nil' as a valid value
double w = lua_gettop(L) >= 4 ? luaL_checknumber(L, 4) : 0.0;
double w = count >= 4 ? luaL_checknumber(L, 4) : 0.0;
lua_pushvector(L, float(x), float(y), float(z), float(w));
#else

4
tests/Compiler.test.cpp
View file

@ -28,7 +28,7 @@ LUAU_FASTFLAG(LuauCompileOptimizeRevArith)
LUAU_FASTFLAG(LuauCompileLibraryConstants)
LUAU_FASTFLAG(LuauVectorBuiltins)
LUAU_FASTFLAG(LuauVectorFolding)
LUAU_FASTFLAG(LuauVector2Constructor)
LUAU_FASTFLAG(LuauVector2Constants)
LUAU_FASTFLAG(LuauCompileDisabledBuiltins)
using namespace Luau;
@ -5106,7 +5106,7 @@ L0: RETURN R3 -1
TEST_CASE("VectorConstants")
{
ScopedFastFlag luauVectorBuiltins{FFlag::LuauVectorBuiltins, true};
ScopedFastFlag luauVector2Constructor{FFlag::LuauVector2Constructor, true};
ScopedFastFlag luauVector2Constants{FFlag::LuauVector2Constants, true};
CHECK_EQ("\n" + compileFunction("return vector.create(1, 2)", 0, 2, 0, /*enableVectors*/ true), R"(
LOADK R0 K0 [1, 2, 0]

2
tests/Conformance.test.cpp
View file

@ -41,6 +41,7 @@ LUAU_FASTFLAG(LuauVectorLibNativeCodegen)
LUAU_FASTFLAG(LuauVectorLibNativeDot)
LUAU_FASTFLAG(LuauVectorBuiltins)
LUAU_FASTFLAG(LuauVectorMetatable)
LUAU_FASTFLAG(LuauVector2Constructor)
static lua_CompileOptions defaultOptions()
{
@ -895,6 +896,7 @@ TEST_CASE("VectorLibrary")
ScopedFastFlag luauVectorLibNativeCodegen{FFlag::LuauVectorLibNativeCodegen, true};
ScopedFastFlag luauVectorLibNativeDot{FFlag::LuauVectorLibNativeDot, true};
ScopedFastFlag luauVectorMetatable{FFlag::LuauVectorMetatable, true};
ScopedFastFlag luauVector2Constructor{FFlag::LuauVector2Constructor, true};
lua_CompileOptions copts = defaultOptions();

6
tests/conformance/vector_library.lua
View file

@ -13,6 +13,12 @@ end
-- make sure we cover both builtin and C impl
assert(vector.create(1, 2, 4) == vector.create("1", "2", "4"))
-- 'create'
local v12 = vector.create(1, 2)
local v123 = vector.create(1, 2, 3)
assert(v12.x == 1 and v12.y == 2 and v12.z == 0)
assert(v123.x == 1 and v123.y == 2 and v123.z == 3)
-- testing 'dot' with error handling and different call kinds to mostly check details in the codegen
assert(vector.dot(vector.create(1, 2, 4), vector.create(5, 6, 7)) == 45)
assert(ecall(function() vector.dot(vector.create(1, 2, 4)) end) == "missing argument #2 to 'dot' (vector expected)")