indrajith/reilua-enhanced
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetMeshData.

Browse Source
This commit is contained in:
jussi
2024-05-10 11:02:31 +03:00
parent 1980aebdc3
commit b3980ae2a5
8 changed files with 276 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
API.md
View File

@@ -7548,6 +7548,14 @@ Compute mesh tangents
---
> meshData = RL.GetMeshData( Mesh mesh )
Get mesh data as table.
- Success return Mesh{}
---
## Models - Mesh generation functions
---

6
ReiLua_API.lua
View File

@@ -4738,6 +4738,12 @@ function RL.GetMeshBoundingBox( mesh ) end
---@return any RL.GenMeshTangents
function RL.GenMeshTangents( mesh ) end
---Get mesh data as table.
---- Success return Mesh{}
---@param mesh any
---@return any meshData
function RL.GetMeshData( mesh ) end
-- Models - Mesh generation functions
---Generate polygonal mesh

4
changelog
View File

@@ -44,8 +44,10 @@ DETAILED CHANGES:
- ADDED: glEnable, glDisable, glGetString and glClear.
- ADDED: Stencil reflection example.
- ADDED: Math Sign.
- FIXED: Camera3D lib Fix up down movement invertion when looking up
- FIXED: Camera3D lib Fix up down movement invertion when looking up.
- ADDED: Bitwise operations for cross Lua compatibility.
- ADDED: GetMeshData.
- FIXED: GenMeshCustom indices wasn't changing triangleCount.
------------------------------------------------------------------------
Release: ReiLua version 0.7.0 Using Raylib 5.0 and Forked Raygui 4.0

2
devnotes
View File

@@ -20,7 +20,7 @@ Backlog {
}
Bugs {
* glfwSet*Callback functions segfault on Windows. Should keep Lua events off.
* glfwSet*Callback functions segfault on Windows. Should keep Lua events off for now.
}
Needs Testing {

4
examples/2D_lights/main.lua
View File

@@ -32,10 +32,6 @@ local shadowMesh = nil
local lights = {}
local camera = nil -- 3D camera for shadow rendering.
local kissa = Color:new( 255, 255, 255 )
print( "Kissa", kissa )
-- Init.
local function addLight( pos, color, radius )

1
include/models.h
View File

@@ -65,6 +65,7 @@ int lmodelsSetMeshColor( lua_State* L );
int lmodelsExportMesh( lua_State* L );
int lmodelsGetMeshBoundingBox( lua_State* L );
int lmodelsGenMeshTangents( lua_State* L );
int lmodelsGetMeshData( lua_State* L );
/* Mesh generation functions. */
int lmodelsGenMeshPoly( lua_State* L );
int lmodelsGenMeshPlane( lua_State* L );

1
src/lua_core.c
View File

@@ -1761,6 +1761,7 @@ void luaRegister() {
assingGlobalFunction( "ExportMesh", lmodelsExportMesh );
assingGlobalFunction( "GetMeshBoundingBox", lmodelsGetMeshBoundingBox );
assingGlobalFunction( "GenMeshTangents", lmodelsGenMeshTangents );
assingGlobalFunction( "GetMeshData", lmodelsGetMeshData );
/* Mesh generation functions. */
assingGlobalFunction( "GenMeshPoly", lmodelsGenMeshPoly );
assingGlobalFunction( "GenMeshPlane", lmodelsGenMeshPlane );

143
src/models.c
View File

@@ -1260,6 +1260,139 @@ int lmodelsGenMeshTangents( lua_State* L ) {
return 0;
}
/*
> meshData = RL.GetMeshData( Mesh mesh )
Get mesh data as table.
- Success return Mesh{}
*/
int lmodelsGetMeshData( lua_State* L ) {
Mesh* mesh = uluaGetMesh( L, 1 );
lua_createtable( L, 2, 0 );
/* Vertices. */
if ( mesh->vertices != NULL ) {
lua_createtable( L, mesh->vertexCount, 0 );
for ( int i = 0; i < mesh->vertexCount; i++ ) {
lua_createtable( L, 3, 0 );
lua_pushnumber( L, mesh->vertices[i * 3 + 0] );
lua_rawseti( L, -2, 1 );
lua_pushnumber( L, mesh->vertices[i * 3 + 1] );
lua_rawseti( L, -2, 2 );
lua_pushnumber( L, mesh->vertices[i * 3 + 2] );
lua_rawseti( L, -2, 3 );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "vertices" );
}
/* Texcoords. */
if ( mesh->texcoords != NULL ) {
lua_createtable( L, mesh->vertexCount, 0 );
for ( int i = 0; i < mesh->vertexCount; i++ ) {
lua_createtable( L, 2, 0 );
lua_pushnumber( L, mesh->texcoords[i * 2 + 0] );
lua_rawseti( L, -2, 1 );
lua_pushnumber( L, mesh->texcoords[i * 2 + 1] );
lua_rawseti( L, -2, 2 );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "texcoords" );
}
if ( mesh->texcoords2 != NULL ) {
lua_createtable( L, mesh->vertexCount, 0 );
for ( int i = 0; i < mesh->vertexCount; i++ ) {
lua_createtable( L, 2, 0 );
lua_pushnumber( L, mesh->texcoords2[i * 2 + 0] );
lua_rawseti( L, -2, 1 );
lua_pushnumber( L, mesh->texcoords2[i * 2 + 1] );
lua_rawseti( L, -2, 2 );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "texcoords2" );
}
/* Normals. */
if ( mesh->normals != NULL ) {
lua_createtable( L, mesh->vertexCount, 0 );
for ( int i = 0; i < mesh->vertexCount; i++ ) {
lua_createtable( L, 3, 0 );
lua_pushnumber( L, mesh->normals[i * 3 + 0] );
lua_rawseti( L, -2, 1 );
lua_pushnumber( L, mesh->normals[i * 3 + 1] );
lua_rawseti( L, -2, 2 );
lua_pushnumber( L, mesh->normals[i * 3 + 2] );
lua_rawseti( L, -2, 3 );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "normals" );
}
/* Tangents. */
if ( mesh->tangents != NULL ) {
lua_createtable( L, mesh->vertexCount, 0 );
for ( int i = 0; i < mesh->vertexCount; i++ ) {
lua_createtable( L, 4, 0 );
lua_pushnumber( L, mesh->tangents[i * 4 + 0] );
lua_rawseti( L, -2, 1 );
lua_pushnumber( L, mesh->tangents[i * 4 + 1] );
lua_rawseti( L, -2, 2 );
lua_pushnumber( L, mesh->tangents[i * 4 + 2] );
lua_rawseti( L, -2, 3 );
lua_pushnumber( L, mesh->tangents[i * 4 + 3] );
lua_rawseti( L, -2, 4 );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "tangents" );
}
/* Colors. */
if ( mesh->colors != NULL ) {
lua_createtable( L, mesh->vertexCount, 0 );
for ( int i = 0; i < mesh->vertexCount; i++ ) {
lua_createtable( L, 4, 0 );
lua_pushinteger( L, mesh->colors[i * 4 + 0] );
lua_rawseti( L, -2, 1 );
lua_pushinteger( L, mesh->colors[i * 4 + 1] );
lua_rawseti( L, -2, 2 );
lua_pushinteger( L, mesh->colors[i * 4 + 2] );
lua_rawseti( L, -2, 3 );
lua_pushinteger( L, mesh->colors[i * 4 + 3] );
lua_rawseti( L, -2, 4 );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "colors" );
}
/* Indices. */
if ( mesh->indices != NULL ) {
lua_createtable( L, mesh->triangleCount * 3, 0 );
for ( int i = 0; i < mesh->triangleCount * 3; i++ ) {
lua_pushinteger( L, mesh->indices[i] );
lua_rawseti( L, -2, i + 1 );
}
lua_setfield( L, -2, "indices" );
}
return 1;
}
/*
## Models - Mesh generation functions
*/
@@ -1461,6 +1594,7 @@ int lmodelsGenMeshCustom( lua_State* L ) {
bool dynamic = uluaGetBoolean( L, 2 );
Mesh mesh = { 0 };
int indiceCount = 0;
int t = 1;
lua_pushnil( L );
@@ -1584,6 +1718,7 @@ int lmodelsGenMeshCustom( lua_State* L ) {
}
else if ( strcmp( "indices", (char*)lua_tostring( L, -2 ) ) == 0 && lua_istable( L, -1 ) ) {
size_t len = uluaGetTableLen( L, lua_gettop( L ) );
indiceCount = len;
mesh.indices = (unsigned short*)MemAlloc( len * sizeof(unsigned short) );
@@ -1599,6 +1734,12 @@ int lmodelsGenMeshCustom( lua_State* L ) {
}
lua_pop( L, 1 );
}
/* We have to set this here since it's not known if vertices or indices are set first. */
if ( 0 < indiceCount ) {
mesh.triangleCount = indiceCount / 3;
}
UploadMesh( &mesh, dynamic );
uluaPushMesh( L, mesh );
@@ -2099,7 +2240,7 @@ int lmodelsSetModelAnimationName( lua_State* L ) {
strncpy( animation->name, name, 32 );
return 1;
return 0;
}
/*