Skip to content

Commit 0ad38ef

Browse files
authored
Update plugins 20240521 (#174)
* Update plugins * Sdk updates
1 parent abc75a1 commit 0ad38ef

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 Bytes
Binary file not shown.

defold-spine/src/comp_spine_model.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ namespace dmSpine
265265
static void* CompSpineModelGetComponent(const dmGameObject::ComponentGetParams& params)
266266
{
267267
SpineModelWorld* world = (SpineModelWorld*)params.m_World;
268-
uint32_t index = (uint32_t)*params.m_UserData;
268+
uint32_t index = (uint32_t) params.m_UserData;
269269
return GetComponentFromIndex(world, index);
270270
}
271271

defold-spine/src/script_spine.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ namespace dmSpine
275275

276276
SpineModelComponent* component = 0;
277277
dmMessage::URL receiver; // needed for error output
278-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
278+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
279279

280280
dmhash_t anim_id = dmScript::CheckHashOrString(L, 2);
281281
lua_Integer playback = luaL_checkinteger(L, 3);
@@ -400,7 +400,7 @@ namespace dmSpine
400400

401401
SpineModelComponent* component = 0;
402402
dmMessage::URL receiver;
403-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
403+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
404404

405405
lua_Integer track = dmSpine::ALL_TRACKS;
406406
if (top > 1) // Options table
@@ -456,7 +456,7 @@ namespace dmSpine
456456

457457
SpineModelComponent* component = 0;
458458
dmMessage::URL receiver; // needed for error output
459-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
459+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
460460

461461
dmhash_t bone_id = dmScript::CheckHashOrString(L, 2);
462462
dmhash_t bone_gameobject_id;
@@ -503,7 +503,7 @@ namespace dmSpine
503503

504504
SpineModelComponent* component = 0;
505505
dmMessage::URL receiver; // needed for error output
506-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
506+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
507507

508508
//TODO: Use top to check if there is an argument there?
509509
dmhash_t skin_id = 0;
@@ -552,7 +552,7 @@ namespace dmSpine
552552

553553
SpineModelComponent* component = 0;
554554
dmMessage::URL receiver; // needed for error output
555-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
555+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
556556

557557
dmhash_t slot_id = dmScript::CheckHashOrString(L, 2);
558558

@@ -600,7 +600,7 @@ namespace dmSpine
600600
DM_LUA_STACK_CHECK(L, 0);
601601

602602
SpineModelComponent* component = 0;
603-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, 0);
603+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, 0);
604604

605605
dmhash_t ik_constraint_id = dmScript::CheckHashOrString(L, 2);
606606
Vectormath::Aos::Vector3* position = dmScript::CheckVector3(L, 3);
@@ -642,7 +642,7 @@ namespace dmSpine
642642

643643
dmMessage::URL target_url;
644644
SpineModelComponent* component = 0;
645-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &target_url);
645+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &target_url);
646646

647647
dmhash_t ik_constraint_id = dmScript::CheckHashOrString(L, 2);
648648

@@ -692,7 +692,7 @@ namespace dmSpine
692692
DM_LUA_STACK_CHECK(L, 0);
693693

694694
SpineModelComponent* component = 0;
695-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, 0);
695+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, 0);
696696

697697
dmhash_t ik_constraint_id = dmScript::CheckHashOrString(L, 2);
698698

@@ -735,7 +735,7 @@ namespace dmSpine
735735

736736
SpineModelComponent* component = 0;
737737
dmMessage::URL receiver;
738-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
738+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
739739

740740
dmhash_t name_hash = dmScript::CheckHashOrString(L, 2);
741741
Vectormath::Aos::Vector4* value = dmScript::CheckVector4(L, 3);
@@ -781,7 +781,7 @@ namespace dmSpine
781781

782782
SpineModelComponent* component = 0;
783783
dmMessage::URL receiver;
784-
dmGameObject::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
784+
dmScript::GetComponentFromLua(L, 1, SPINE_MODEL_EXT, 0, (void**)&component, &receiver);
785785

786786
dmhash_t name_hash = dmScript::CheckHashOrString(L, 2);
787787

0 commit comments

Comments
 (0)