Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unpack buffer from argument before setting texture #8670

Merged
merged 1 commit into from
Mar 12, 2024
Merged

Unpack buffer from argument before setting texture #8670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 25 additions & 3 deletions engine/gamesys/src/gamesys/scripts/script_resource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,28 @@ static int ReleaseResource(lua_State* L)
*
* local resource_path = go.get("#model", "texture0")
* local args = { width=self.width, height=self.height, x=self.x, y=self.y, type=resource.TEXTURE_TYPE_2D, format=resource.TEXTURE_FORMAT_RGB, num_mip_maps=1 }
* resource.set_texture( resource_path, args, self.buffer )
* resource.set_texture(resource_path, args, self.buffer )
* end
* ```
*
* @examples
* Update a texture from a buffer resource
* ```lua
* go.property("my_buffer", resource.buffer("/my_default_buffer.buffer"))
*
* function init(self)
* local resource_path = go.get("#model", "texture0")
* -- the "my_buffer" resource is expected to hold 128 * 128 * 3 bytes!
* local args = {
* width = 128,
* height = 128,
* type = resource.TEXTURE_TYPE_2D,
* format = resource.TEXTURE_FORMAT_RGB
* }
* -- Note that the extra resource.get_buffer call is a requirement here
* -- since the "self.my_buffer" is just pointing to a buffer resource path
* -- and not an actual buffer object or buffer resource.
* resource.set_texture(resource_path, args, resource.get_buffer(self.my_buffer))
* end
* ```
*/
Expand Down Expand Up @@ -1074,11 +1095,12 @@ static int SetTexture(lua_State* L)

uint8_t layer_count = type == dmGraphics::TEXTURE_TYPE_CUBE_MAP ? 6 : 1;

dmScript::LuaHBuffer* buffer = dmScript::CheckBuffer(L, 3);
dmScript::LuaHBuffer* lua_buffer = dmScript::CheckBuffer(L, 3);
dmBuffer::HBuffer buffer_handle = dmGameSystem::UnpackLuaBuffer(lua_buffer);

uint8_t* data = 0;
uint32_t datasize = 0;
dmBuffer::GetBytes(buffer->m_Buffer, (void**)&data, &datasize);
dmBuffer::GetBytes(buffer_handle, (void**)&data, &datasize);

dmGraphics::TextureImage::Image image = {};
dmGraphics::TextureImage texture_image = {};
Expand Down