From 31fc965b692092a7c5bc83a18d64baf6eb2d0208 Mon Sep 17 00:00:00 2001 From: Luis Michaelis Date: Wed, 6 Dec 2023 18:31:56 +0100 Subject: [PATCH] fix(*): fixup missing and broken implementations --- .../daedalus/EffectBaseInstance.hh | 3 +- .../daedalus/ParticleEffectEmitKeyInstance.hh | 54 ++++++++++++------- include/zenkit-capi/vobs/Camera.h | 1 - src/daedalus/GuildValuesInstance.cc | 2 +- src/daedalus/ParticleEffectEmitKeyInstance.cc | 30 +++++++---- src/vobs/Camera.cc | 5 -- src/vobs/VirtualObject.cc | 37 +++++++++++++ 7 files changed, 96 insertions(+), 36 deletions(-) diff --git a/include/zenkit-capi/daedalus/EffectBaseInstance.hh b/include/zenkit-capi/daedalus/EffectBaseInstance.hh index 1aef10c..b77bfd0 100644 --- a/include/zenkit-capi/daedalus/EffectBaseInstance.hh +++ b/include/zenkit-capi/daedalus/EffectBaseInstance.hh @@ -52,7 +52,8 @@ ZKC_API void ZkEffectBaseInstance_setEmTrjEaseVel(ZkEffectBaseInstance* slf, flo ZKC_API float ZkEffectBaseInstance_getEmTrjDynUpdateDelay(ZkEffectBaseInstance const* slf); ZKC_API void ZkEffectBaseInstance_setEmTrjDynUpdateDelay(ZkEffectBaseInstance* slf, float emTrjDynUpdateDelay); ZKC_API int32_t ZkEffectBaseInstance_getEmTrjDynUpdateTargetOnly(ZkEffectBaseInstance const* slf); -ZKC_API void ZkEffectBaseInstance_setEmTrjDynUpdateTargetOnly(ZkEffectBaseInstance* slf, int32_t emTrjDynUpdateTargetOnly); +ZKC_API void ZkEffectBaseInstance_setEmTrjDynUpdateTargetOnly(ZkEffectBaseInstance* slf, + int32_t emTrjDynUpdateTargetOnly); ZKC_API ZkString ZkEffectBaseInstance_getEmFxCreateS(ZkEffectBaseInstance const* slf); ZKC_API void ZkEffectBaseInstance_setEmFxCreateS(ZkEffectBaseInstance* slf, ZkString emFxCreateS); ZKC_API ZkString ZkEffectBaseInstance_getEmFxInvestOriginS(ZkEffectBaseInstance const* slf); diff --git a/include/zenkit-capi/daedalus/ParticleEffectEmitKeyInstance.hh b/include/zenkit-capi/daedalus/ParticleEffectEmitKeyInstance.hh index 614ddc9..cf5b809 100644 --- a/include/zenkit-capi/daedalus/ParticleEffectEmitKeyInstance.hh +++ b/include/zenkit-capi/daedalus/ParticleEffectEmitKeyInstance.hh @@ -13,62 +13,80 @@ ZKC_API void ZkParticleEffectEmitKeyInstance_setVisNameS(ZkParticleEffectEmitKey ZKC_API float ZkParticleEffectEmitKeyInstance_getVisSizeScale(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setVisSizeScale(ZkParticleEffectEmitKeyInstance* slf, float visSizeScale); ZKC_API float ZkParticleEffectEmitKeyInstance_getScaleDuration(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setScaleDuration(ZkParticleEffectEmitKeyInstance* slf, float scaleDuration); +ZKC_API void ZkParticleEffectEmitKeyInstance_setScaleDuration(ZkParticleEffectEmitKeyInstance* slf, + float scaleDuration); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxPpsValue(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxPpsValue(ZkParticleEffectEmitKeyInstance* slf, float pfxPpsValue); ZKC_API int32_t ZkParticleEffectEmitKeyInstance_getPfxPpsIsSmoothChg(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxPpsIsSmoothChg(ZkParticleEffectEmitKeyInstance* slf, int32_t pfxPpsIsSmoothChg); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxPpsIsSmoothChg(ZkParticleEffectEmitKeyInstance* slf, + int32_t pfxPpsIsSmoothChg); ZKC_API int32_t ZkParticleEffectEmitKeyInstance_getPfxPpsIsLoopingChg(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxPpsIsLoopingChg(ZkParticleEffectEmitKeyInstance* slf, int32_t pfxPpsIsLoopingChg); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxPpsIsLoopingChg(ZkParticleEffectEmitKeyInstance* slf, + int32_t pfxPpsIsLoopingChg); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxScTime(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxScTime(ZkParticleEffectEmitKeyInstance* slf, float pfxScTime); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxFlyGravityS(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxFlyGravityS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxFlyGravityS); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxFlyGravityS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxFlyGravityS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxShpDimS(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpDimS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxShpDimS); ZKC_API int32_t ZkParticleEffectEmitKeyInstance_getPfxShpIsVolumeChg(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpIsVolumeChg(ZkParticleEffectEmitKeyInstance* slf, int32_t pfxShpIsVolumeChg); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpIsVolumeChg(ZkParticleEffectEmitKeyInstance* slf, + int32_t pfxShpIsVolumeChg); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxShpScaleFps(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpScaleFps(ZkParticleEffectEmitKeyInstance* slf, float pfxShpScaleFps); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpScaleFps(ZkParticleEffectEmitKeyInstance* slf, + float pfxShpScaleFps); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxShpDistribWalksPeed(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpDistribWalksPeed(ZkParticleEffectEmitKeyInstance* slf, float pfxShpDistribWalksPeed); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpDistribWalksPeed(ZkParticleEffectEmitKeyInstance* slf, + float pfxShpDistribWalksPeed); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxShpOffsetVecS(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpOffsetVecS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxShpOffsetVecS); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpOffsetVecS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxShpOffsetVecS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxShpDistribTypeS(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpDistribTypeS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxShpDistribTypeS); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxShpDistribTypeS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxShpDistribTypeS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxDirModeS(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxDirModeS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxDirModeS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxDirForS(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxDirForS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxDirForS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxDirModeTargetForS(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetForS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxDirModeTargetForS); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetForS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxDirModeTargetForS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getPfxDirModeTargetPosS(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetPosS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxDirModeTargetPosS); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetPosS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxDirModeTargetPosS); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxVelAvg(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxVelAvg(ZkParticleEffectEmitKeyInstance* slf, float pfxVelAvg); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxLspPartAvg(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxLspPartAvg(ZkParticleEffectEmitKeyInstance* slf, float pfxLspPartAvg); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxLspPartAvg(ZkParticleEffectEmitKeyInstance* slf, + float pfxLspPartAvg); ZKC_API float ZkParticleEffectEmitKeyInstance_getPfxVisAlphaStart(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxVisAlphaStart(ZkParticleEffectEmitKeyInstance* slf, float pfxVisAlphaStart); +ZKC_API void ZkParticleEffectEmitKeyInstance_setPfxVisAlphaStart(ZkParticleEffectEmitKeyInstance* slf, + float pfxVisAlphaStart); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getLightPresetName(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setLightPresetName(ZkParticleEffectEmitKeyInstance* slf, ZkString lightPresetName); +ZKC_API void ZkParticleEffectEmitKeyInstance_setLightPresetName(ZkParticleEffectEmitKeyInstance* slf, + ZkString lightPresetName); ZKC_API float ZkParticleEffectEmitKeyInstance_getLightRange(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setLightRange(ZkParticleEffectEmitKeyInstance* slf, float lightRange); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getSfxId(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setSfxId(ZkParticleEffectEmitKeyInstance* slf, ZkString sfxId); ZKC_API int32_t ZkParticleEffectEmitKeyInstance_getSfxIsAmbient(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setSfxIsAmbient(ZkParticleEffectEmitKeyInstance* slf, int32_t sfxIsAmbient); +ZKC_API void ZkParticleEffectEmitKeyInstance_setSfxIsAmbient(ZkParticleEffectEmitKeyInstance* slf, + int32_t sfxIsAmbient); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getEmCreateFxId(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setEmCreateFxId(ZkParticleEffectEmitKeyInstance* slf, ZkString emCreateFxId); +ZKC_API void ZkParticleEffectEmitKeyInstance_setEmCreateFxId(ZkParticleEffectEmitKeyInstance* slf, + ZkString emCreateFxId); ZKC_API float ZkParticleEffectEmitKeyInstance_getEmFlyGravity(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setEmFlyGravity(ZkParticleEffectEmitKeyInstance* slf, float emFlyGravity); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getEmSelfRotVelS(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setEmSelfRotVelS(ZkParticleEffectEmitKeyInstance* slf, ZkString emSelfRotVelS); +ZKC_API void ZkParticleEffectEmitKeyInstance_setEmSelfRotVelS(ZkParticleEffectEmitKeyInstance* slf, + ZkString emSelfRotVelS); ZKC_API ZkString ZkParticleEffectEmitKeyInstance_getEmTrjModeS(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setEmTrjModeS(ZkParticleEffectEmitKeyInstance* slf, ZkString emTrjModeS); ZKC_API float ZkParticleEffectEmitKeyInstance_getEmTrjEaseVel(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setEmTrjEaseVel(ZkParticleEffectEmitKeyInstance* slf, float emTrjEaseVel); ZKC_API int32_t ZkParticleEffectEmitKeyInstance_getEmCheckCollision(ZkParticleEffectEmitKeyInstance const* slf); -ZKC_API void ZkParticleEffectEmitKeyInstance_setEmCheckCollision(ZkParticleEffectEmitKeyInstance* slf, int32_t emCheckCollision); +ZKC_API void ZkParticleEffectEmitKeyInstance_setEmCheckCollision(ZkParticleEffectEmitKeyInstance* slf, + int32_t emCheckCollision); ZKC_API float ZkParticleEffectEmitKeyInstance_getEmFxLifespan(ZkParticleEffectEmitKeyInstance const* slf); ZKC_API void ZkParticleEffectEmitKeyInstance_setEmFxLifespan(ZkParticleEffectEmitKeyInstance* slf, float emFxLifespan); diff --git a/include/zenkit-capi/vobs/Camera.h b/include/zenkit-capi/vobs/Camera.h index 5ccd172..464f6de 100644 --- a/include/zenkit-capi/vobs/Camera.h +++ b/include/zenkit-capi/vobs/Camera.h @@ -79,7 +79,6 @@ ZKC_API void ZkCutsceneCamera_setAutoUntriggerLast(ZkCutsceneCamera* slf, ZkBool ZKC_API float ZkCutsceneCamera_getAutoUntriggerLastDelay(ZkCutsceneCamera const* slf); ZKC_API void ZkCutsceneCamera_setAutoUntriggerLastDelay(ZkCutsceneCamera* slf, float autoUntriggerLastDelay); ZKC_API int32_t ZkCutsceneCamera_getPositionCount(ZkCutsceneCamera const* slf); -ZKC_API void ZkCutsceneCamera_setPositionCount(ZkCutsceneCamera* slf, int32_t positionCount); ZKC_API int32_t ZkCutsceneCamera_getTargetCount(ZkCutsceneCamera const* slf); ZKC_API void ZkCutsceneCamera_setTargetCount(ZkCutsceneCamera* slf, int32_t targetCount); diff --git a/src/daedalus/GuildValuesInstance.cc b/src/daedalus/GuildValuesInstance.cc index 306aced..494b65e 100644 --- a/src/daedalus/GuildValuesInstance.cc +++ b/src/daedalus/GuildValuesInstance.cc @@ -132,7 +132,7 @@ int32_t ZkGuildValuesInstance_getDisableAutoRoll(ZkGuildValuesInstance const* sl void ZkGuildValuesInstance_setDisableAutoRoll(ZkGuildValuesInstance* slf, ZkSize i, int32_t disableAutoRoll) { ZKC_CHECK_NULLV(slf); ZKC_CHECK_LENAV(ZkGuildValuesInstance_ElementLength, i); - slf->disable_autoroll [i]= disableAutoRoll; + slf->disable_autoroll[i] = disableAutoRoll; } int32_t ZkGuildValuesInstance_getSurfaceAlign(ZkGuildValuesInstance const* slf, ZkSize i) { diff --git a/src/daedalus/ParticleEffectEmitKeyInstance.cc b/src/daedalus/ParticleEffectEmitKeyInstance.cc index 167373e..ca2302a 100644 --- a/src/daedalus/ParticleEffectEmitKeyInstance.cc +++ b/src/daedalus/ParticleEffectEmitKeyInstance.cc @@ -46,7 +46,8 @@ int32_t ZkParticleEffectEmitKeyInstance_getPfxPpsIsSmoothChg(ZkParticleEffectEmi return slf->pfx_pps_is_smooth_chg; } -void ZkParticleEffectEmitKeyInstance_setPfxPpsIsSmoothChg(ZkParticleEffectEmitKeyInstance* slf, int32_t pfxPpsIsSmoothChg) { +void ZkParticleEffectEmitKeyInstance_setPfxPpsIsSmoothChg(ZkParticleEffectEmitKeyInstance* slf, + int32_t pfxPpsIsSmoothChg) { ZKC_CHECK_NULLV(slf); slf->pfx_pps_is_smooth_chg = pfxPpsIsSmoothChg; } @@ -56,7 +57,8 @@ int32_t ZkParticleEffectEmitKeyInstance_getPfxPpsIsLoopingChg(ZkParticleEffectEm return slf->pfx_pps_is_looping_chg; } -void ZkParticleEffectEmitKeyInstance_setPfxPpsIsLoopingChg(ZkParticleEffectEmitKeyInstance* slf, int32_t pfxPpsIsLoopingChg) { +void ZkParticleEffectEmitKeyInstance_setPfxPpsIsLoopingChg(ZkParticleEffectEmitKeyInstance* slf, + int32_t pfxPpsIsLoopingChg) { ZKC_CHECK_NULLV(slf); slf->pfx_pps_is_looping_chg = pfxPpsIsLoopingChg; } @@ -96,7 +98,8 @@ int32_t ZkParticleEffectEmitKeyInstance_getPfxShpIsVolumeChg(ZkParticleEffectEmi return slf->pfx_shp_is_volume_chg; } -void ZkParticleEffectEmitKeyInstance_setPfxShpIsVolumeChg(ZkParticleEffectEmitKeyInstance* slf, int32_t pfxShpIsVolumeChg) { +void ZkParticleEffectEmitKeyInstance_setPfxShpIsVolumeChg(ZkParticleEffectEmitKeyInstance* slf, + int32_t pfxShpIsVolumeChg) { ZKC_CHECK_NULLV(slf); slf->pfx_shp_is_volume_chg = pfxShpIsVolumeChg; } @@ -116,7 +119,8 @@ float ZkParticleEffectEmitKeyInstance_getPfxShpDistribWalksPeed(ZkParticleEffect return slf->pfx_shp_distrib_walks_peed; } -void ZkParticleEffectEmitKeyInstance_setPfxShpDistribWalksPeed(ZkParticleEffectEmitKeyInstance* slf, float pfxShpDistribWalksPeed) { +void ZkParticleEffectEmitKeyInstance_setPfxShpDistribWalksPeed(ZkParticleEffectEmitKeyInstance* slf, + float pfxShpDistribWalksPeed) { ZKC_CHECK_NULLV(slf); slf->pfx_shp_distrib_walks_peed = pfxShpDistribWalksPeed; } @@ -126,7 +130,8 @@ ZkString ZkParticleEffectEmitKeyInstance_getPfxShpOffsetVecS(ZkParticleEffectEmi return slf->pfx_shp_offset_vec_s.c_str(); } -void ZkParticleEffectEmitKeyInstance_setPfxShpOffsetVecS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxShpOffsetVecS) { +void ZkParticleEffectEmitKeyInstance_setPfxShpOffsetVecS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxShpOffsetVecS) { ZKC_CHECK_NULLV(slf); slf->pfx_shp_offset_vec_s = pfxShpOffsetVecS; } @@ -136,7 +141,8 @@ ZkString ZkParticleEffectEmitKeyInstance_getPfxShpDistribTypeS(ZkParticleEffectE return slf->pfx_shp_distrib_type_s.c_str(); } -void ZkParticleEffectEmitKeyInstance_setPfxShpDistribTypeS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxShpDistribTypeS) { +void ZkParticleEffectEmitKeyInstance_setPfxShpDistribTypeS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxShpDistribTypeS) { ZKC_CHECK_NULLV(slf); slf->pfx_shp_distrib_type_s = pfxShpDistribTypeS; } @@ -166,7 +172,8 @@ ZkString ZkParticleEffectEmitKeyInstance_getPfxDirModeTargetForS(ZkParticleEffec return slf->pfx_dir_mode_target_for_s.c_str(); } -void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetForS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxDirModeTargetForS) { +void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetForS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxDirModeTargetForS) { ZKC_CHECK_NULLV(slf); slf->pfx_dir_mode_target_for_s = pfxDirModeTargetForS; } @@ -176,7 +183,8 @@ ZkString ZkParticleEffectEmitKeyInstance_getPfxDirModeTargetPosS(ZkParticleEffec return slf->pfx_dir_mode_target_pos_s.c_str(); } -void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetPosS(ZkParticleEffectEmitKeyInstance* slf, ZkString pfxDirModeTargetPosS) { +void ZkParticleEffectEmitKeyInstance_setPfxDirModeTargetPosS(ZkParticleEffectEmitKeyInstance* slf, + ZkString pfxDirModeTargetPosS) { ZKC_CHECK_NULLV(slf); slf->pfx_dir_mode_target_pos_s = pfxDirModeTargetPosS; } @@ -216,7 +224,8 @@ ZkString ZkParticleEffectEmitKeyInstance_getLightPresetName(ZkParticleEffectEmit return slf->light_preset_name.c_str(); } -void ZkParticleEffectEmitKeyInstance_setLightPresetName(ZkParticleEffectEmitKeyInstance* slf, ZkString lightPresetName) { +void ZkParticleEffectEmitKeyInstance_setLightPresetName(ZkParticleEffectEmitKeyInstance* slf, + ZkString lightPresetName) { ZKC_CHECK_NULLV(slf); slf->light_preset_name = lightPresetName; } @@ -306,7 +315,8 @@ int32_t ZkParticleEffectEmitKeyInstance_getEmCheckCollision(ZkParticleEffectEmit return slf->em_check_collision; } -void ZkParticleEffectEmitKeyInstance_setEmCheckCollision(ZkParticleEffectEmitKeyInstance* slf, int32_t emCheckCollision) { +void ZkParticleEffectEmitKeyInstance_setEmCheckCollision(ZkParticleEffectEmitKeyInstance* slf, + int32_t emCheckCollision) { ZKC_CHECK_NULLV(slf); slf->em_check_collision = emCheckCollision; } diff --git a/src/vobs/Camera.cc b/src/vobs/Camera.cc index d933b73..fefcd66 100644 --- a/src/vobs/Camera.cc +++ b/src/vobs/Camera.cc @@ -155,11 +155,6 @@ int32_t ZkCutsceneCamera_getPositionCount(ZkCutsceneCamera const* slf) { return slf->position_count; } -void ZkCutsceneCamera_setPositionCount(ZkCutsceneCamera* slf, int32_t positionCount) { - ZKC_CHECK_NULLV(slf); - slf->position_count = positionCount; -} - int32_t ZkCutsceneCamera_getTargetCount(ZkCutsceneCamera const* slf) { ZKC_CHECK_NULL(slf); return slf->target_count; diff --git a/src/vobs/VirtualObject.cc b/src/vobs/VirtualObject.cc index d8120db..8712955 100644 --- a/src/vobs/VirtualObject.cc +++ b/src/vobs/VirtualObject.cc @@ -202,6 +202,43 @@ ZkVisual* ZkVirtualObject_getVisual(ZkVirtualObject const* slf) { return slf->visual ? slf->visual.get() : nullptr; } +ZkVisual* ZkVirtualObject_setVisual(ZkVirtualObject* slf, ZkVisualType visual) { + ZKC_CHECK_NULL(slf); + + std::shared_ptr obj; + + switch (visual) { + case ZkVisualType_DECAL: + obj = std::make_shared(); + break; + case ZkVisualType_MESH: + obj = std::make_shared(); + break; + case ZkVisualType_MULTI_RESOLUTION_MESH: + obj = std::make_shared(); + break; + case ZkVisualType_PARTICLE_EFFECT: + obj = std::make_shared(); + break; + case ZkVisualType_CAMERA: + obj = std::make_shared(); + break; + case ZkVisualType_MODEL: + obj = std::make_shared(); + break; + case ZkVisualType_MORPH_MESH: + obj = std::make_shared(); + break; + case ZkVisualType_UNKNOWN: + obj = nullptr; + break; + } + + obj->type = static_cast(visual); + slf->visual = obj; + return obj.get(); +} + ZkSize ZkVirtualObject_getChildCount(ZkVirtualObject const* slf) { ZKC_CHECK_NULL(slf); return slf->children.size();