LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move ByteData float/int getter methods to Data.

Browse Source
This commit is contained in:
Sasha Szpakowski
2023-02-19 19:52:07 -04:00
parent 416abdbc59
commit 78de7bdf3c
2 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/data/wrap_ByteData.cpp
-81
View File
@@ -76,27 +76,6 @@ int w_ByteData_setT(lua_State *L)
return 0;
}
template <typename T>
int w_ByteData_getT(lua_State *L)
{
ByteData *t = luax_checkbytedata(L, 1);
int64 offset = (int64) luaL_checknumber(L, 2);
int count = (int) luaL_optinteger(L, 3, 1);
if (count <= 0)
return luaL_error(L, "Invalid count parameter (must be greater than 0)");
if (offset < 0 || offset + sizeof(T) * count > t->getSize())
return luaL_error(L, "The given offset and count parameters don't fit within the ByteData's size.");
auto data = (const T *)((uint8 *) t->getData() + offset);
for (int i = 0; i < count; i++)
lua_pushnumber(L, (lua_Number) data[i]);
return count;
}
int w_ByteData_setFloat(lua_State *L)
{
return w_ByteData_setT<float>(L);
@@ -147,56 +126,6 @@ int w_ByteData_setUInt64(lua_State *L)
return w_ByteData_setT<uint64>(L);
}
int w_ByteData_getFloat(lua_State *L)
{
return w_ByteData_getT<float>(L);
}
int w_ByteData_getDouble(lua_State *L)
{
return w_ByteData_getT<double>(L);
}
int w_ByteData_getInt8(lua_State *L)
{
return w_ByteData_getT<int8>(L);
}
int w_ByteData_getUInt8(lua_State *L)
{
return w_ByteData_getT<uint8>(L);
}
int w_ByteData_getInt16(lua_State *L)
{
return w_ByteData_getT<int16>(L);
}
int w_ByteData_getUInt16(lua_State *L)
{
return w_ByteData_getT<uint16>(L);
}
int w_ByteData_getInt32(lua_State *L)
{
return w_ByteData_getT<int32>(L);
}
int w_ByteData_getUInt32(lua_State *L)
{
return w_ByteData_getT<uint32>(L);
}
int w_ByteData_getInt64(lua_State *L)
{
return w_ByteData_getT<int64>(L);
}
int w_ByteData_getUInt64(lua_State *L)
{
return w_ByteData_getT<uint64>(L);
}
static const luaL_Reg w_ByteData_functions[] =
{
{ "clone", w_ByteData_clone },
@@ -210,16 +139,6 @@ static const luaL_Reg w_ByteData_functions[] =
{ "setUInt32", w_ByteData_setUInt32 },
{ "setInt64", w_ByteData_setInt64 },
{ "setUInt64", w_ByteData_setUInt64 },
{ "getFloat", w_ByteData_getFloat },
{ "getDouble", w_ByteData_getDouble },
{ "getInt8", w_ByteData_getInt8 },
{ "getUInt8", w_ByteData_getUInt8 },
{ "getInt16", w_ByteData_getInt16 },
{ "getUInt16", w_ByteData_getUInt16 },
{ "getInt32", w_ByteData_getInt32 },
{ "getUInt32", w_ByteData_getUInt32 },
{ "getInt64", w_ByteData_getInt64 },
{ "getUInt64", w_ByteData_getUInt64 },
{ 0, 0 }
};
src/modules/data/wrap_Data.cpp
+81
View File
@@ -78,6 +78,77 @@ int w_Data_getSize(lua_State *L)
return 1;
}
template <typename T>
static int w_Data_getT(lua_State* L)
{
Data* t = luax_checkdata(L, 1);
int64 offset = (int64)luaL_checknumber(L, 2);
int count = (int)luaL_optinteger(L, 3, 1);
if (count <= 0)
return luaL_error(L, "Invalid count parameter (must be greater than 0)");
if (offset < 0 || offset + sizeof(T) * count > t->getSize())
return luaL_error(L, "The given offset and count parameters don't fit within the Data's size.");
auto data = (const T*)((uint8*)t->getData() + offset);
for (int i = 0; i < count; i++)
lua_pushnumber(L, (lua_Number)data[i]);
return count;
}
int w_Data_getFloat(lua_State* L)
{
return w_Data_getT<float>(L);
}
int w_Data_getDouble(lua_State* L)
{
return w_Data_getT<double>(L);
}
int w_Data_getInt8(lua_State* L)
{
return w_Data_getT<int8>(L);
}
int w_Data_getUInt8(lua_State* L)
{
return w_Data_getT<uint8>(L);
}
int w_Data_getInt16(lua_State* L)
{
return w_Data_getT<int16>(L);
}
int w_Data_getUInt16(lua_State* L)
{
return w_Data_getT<uint16>(L);
}
int w_Data_getInt32(lua_State* L)
{
return w_Data_getT<int32>(L);
}
int w_Data_getUInt32(lua_State* L)
{
return w_Data_getT<uint32>(L);
}
int w_Data_getInt64(lua_State* L)
{
return w_Data_getT<int64>(L);
}
int w_Data_getUInt64(lua_State* L)
{
return w_Data_getT<uint64>(L);
}
// C functions in a struct, necessary for the FFI versions of Data methods.
struct FFI_Data
{
@@ -99,6 +170,16 @@ const luaL_Reg w_Data_functions[] =
{ "getPointer", w_Data_getPointer },
{ "getFFIPointer", w_Data_getFFIPointer },
{ "getSize", w_Data_getSize },
{ "getFloat", w_Data_getFloat },
{ "getDouble", w_Data_getDouble },
{ "getInt8", w_Data_getInt8 },
{ "getUInt8", w_Data_getUInt8 },
{ "getInt16", w_Data_getInt16 },
{ "getUInt16", w_Data_getUInt16 },
{ "getInt32", w_Data_getInt32 },
{ "getUInt32", w_Data_getUInt32 },
{ "getInt64", w_Data_getInt64 },
{ "getUInt64", w_Data_getUInt64 },
{ 0, 0 }
};