Merge pull request #1052 from MihailRis/add-sksleton-get-bone-offset

add skeleton:get_bone_offset
This commit is contained in:
MihailRis 2026-10-18 17:52:41 +03:00 • committed by GitHub
commit 3edb96e291
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 34 additions and 5 deletions

View file

@ -26,6 +26,10 @@ skeleton:get_matrix(index: int) -> mat4
-- Sets the transformation matrix of the bone with the specified index
skeleton:set_matrix(index: int, matrix: mat4)
-- Returns the offset of the bone with the specified index relative to its parent
-- (as defined in the skeleton config)
skeleton:get_bone_offset(index: int) -> vec3
-- Returns the texture by key (dynamically assigned textures - '$name')
skeleton:get_texture(key: str) -> str

View file

@ -172,6 +172,9 @@ rig:get_matrix(index: int) -> mat4
-- Sets the bone transformation matrix at the specified index
rig:set_matrix(index: int, matrix: mat4)
-- Returns the bone offset relative to its parent (from the skeleton config)
rig:get_bone_offset(index: int) -> vec3
-- Returns the texture by key (dynamically assigned textures - '$name')
rig:get_texture(key: str) -> str

View file

@ -27,6 +27,10 @@ skeleton:get_matrix(index: int) -> mat4
-- Устанавливает матрицу трансформации кости с указанным индексом
skeleton:set_matrix(index: int, matrix: mat4)
-- Возвращает смещение кости с указанным индексом относительно родительской
-- (как задано в конфиге скелета)
skeleton:get_bone_offset(index: int) -> vec3
-- Возвращает текстуру по ключу (динамически назначаемые текстуры - '$имя')
skeleton:get_texture(key: string) -> string

View file

@ -161,6 +161,9 @@ rig:get_matrix(index: int) -> mat4
-- Устанавливает матрицу трансформации кости с указанным индексом
rig:set_matrix(index: int, matrix: mat4)
-- Возвращает смещение кости относительно родительской (из конфига скелета)
rig:get_bone_offset(index: int) -> vec3
-- Возвращает текстуру по ключу (динамически назначаемые текстуры - '$имя')
rig:get_texture(key: str) -> str

View file

@ -53,6 +53,7 @@ local Skeleton = {__index={
set_model=function(self, i, s) return __skeleton.set_model(self.eid, i, s) end,
get_matrix=function(self, i, ...) return __skeleton.get_matrix(self.eid, i, ...) end,
set_matrix=function(self, i, m) return __skeleton.set_matrix(self.eid, i, m) end,
get_bone_offset=function(self, i) return __skeleton.get_bone_offset(self.eid, i) end,
reset_pose=function(self) return __skeleton.reset_pose(self.eid) end,
get_texture=function(self, s) return __skeleton.get_texture(self.eid, s) end,
set_texture=function(self, s, s2) return __skeleton.set_texture(self.eid, s, s2) end,

View file

@ -16,14 +16,16 @@ local Skeleton = {__index={
index=function(self, s) return gfx.skeletons.index(self.name, s) end,
get_model=function(self, i) return gfx.skeletons.get_model(self.name, i) end,
set_model=function(self, i, s) return gfx.skeletons.set_model(self.name, i, s) end,
get_matrix=function(self, i) return gfx.skeletons.get_matrix(self.name, i) end,
get_matrix=function(self, i, ...) return gfx.skeletons.get_matrix(self.name, i, ...) end,
reset_pose=function(self, ...) return gfx.skeletons.reset_pose(self.name, ...) end,
set_matrix=function(self, i, m) return gfx.skeletons.set_matrix(self.name, i, m) end,
get_bone_offset=function(self, i) return gfx.skeletons.get_bone_offset(self.name, i) end,
get_texture=function(self, i) return gfx.skeletons.get_texture(self.name, i) end,
set_texture=function(self, i, s) return gfx.skeletons.set_texture(self.name, i, s) end,
is_visible=function(self, i) return gfx.skeletons.is_visible(self.name, i) end,
set_visible=function(self, i, b) return gfx.skeletons.set_visible(self.name, i, b) end,
get_color=function(self, i) return gfx.skeletons.get_color(self.name, i) end,
set_color=function(self, i, c) return gfx.skeletons.set_color(self.name, i, c) end,
is_visible=function(self, ...) return gfx.skeletons.is_visible(self.name, ...) end,
set_visible=function(self, ...) return gfx.skeletons.set_visible(self.name, ...) end,
get_color=function(self, ...) return gfx.skeletons.get_color(self.name, ...) end,
set_color=function(self, ...) return gfx.skeletons.set_color(self.name, ...) end,
}}
gfx.text3d.new = function(pos, text, preset, extension)

View file

@ -89,6 +89,17 @@ static int l_set_matrix(lua::State* L) {
return 0;
}
static int l_get_bone_offset(lua::State* L) {
if (auto skeleton = get_skeleton(L)) {
if (skeleton->config == nullptr) {
return 0;
}
auto index = index_range_check(*skeleton, lua::tointeger(L, 2));
return lua::pushvec(L, skeleton->config->getBones()[index]->getOffset());
}
return 0;
}
static int l_reset_pose(lua::State* L) {
if (auto skeleton = get_skeleton(L)) {
auto& pose = skeleton->pose;
@ -372,6 +383,7 @@ const luaL_Reg skeletonlib[] = {
{"set_model", lua::wrap<l_set_model>},
{"get_matrix", lua::wrap<l_get_matrix>},
{"set_matrix", lua::wrap<l_set_matrix>},
{"get_bone_offset", lua::wrap<l_get_bone_offset>},
{"reset_pose", lua::wrap<l_reset_pose>},
{"get_texture", lua::wrap<l_get_texture>},
{"set_texture", lua::wrap<l_set_texture>},