Skip to content

Commit

Permalink
chore(Visual): rename ZkDecal -> ZkVisualDecal
Browse files Browse the repository at this point in the history
  • Loading branch information
lmichaelis committed Dec 5, 2023
1 parent 1698b35 commit 5c83f70
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
20 changes: 10 additions & 10 deletions include/zenkit-capi/vobs/VirtualObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
#include <zenkit/vobs/VirtualObject.hh>
using ZkVirtualObject = zenkit::VirtualObject;
using ZkVisual = zenkit::Visual;
using ZkDecal = zenkit::VisualDecal;
using ZkVisualDecal = zenkit::VisualDecal;
#else
typedef struct ZkInternal_VirtualObject ZkVirtualObject;
typedef struct ZkInternal_Visual ZkVisual;
typedef struct ZkInternal_Decal ZkDecal;
typedef struct ZkInternal_VisualDecal ZkVisualDecal;
#endif

typedef ZkBool (*ZkVirtualObjectEnumerator)(void* ctx, ZkVirtualObject const* vob);
Expand Down Expand Up @@ -132,11 +132,11 @@ ZKC_API void ZkVirtualObject_enumerateChildren(ZkVirtualObject const* slf, ZkVir
ZKC_API ZkString ZkVisual_getName(ZkVisual const* slf);
ZKC_API ZkVisualType ZkVisual_getType(ZkVisual const* slf);

ZKC_API ZkString ZkDecal_getName(ZkDecal const* slf);
ZKC_API ZkVec2f ZkDecal_getDimension(ZkDecal const* slf);
ZKC_API ZkVec2f ZkDecal_getOffset(ZkDecal const* slf);
ZKC_API ZkBool ZkDecal_getTwoSided(ZkDecal const* slf);
ZKC_API ZkAlphaFunction ZkDecal_getAlphaFunc(ZkDecal const* slf);
ZKC_API float ZkDecal_getTextureAnimFps(ZkDecal const* slf);
ZKC_API uint8_t ZkDecal_getAlphaWeight(ZkDecal const* slf);
ZKC_API ZkBool ZkDecal_getIgnoreDaylight(ZkDecal const* slf);
ZKC_API ZkString ZkVisualDecal_getName(ZkVisualDecal const* slf);
ZKC_API ZkVec2f ZkVisualDecal_getDimension(ZkVisualDecal const* slf);
ZKC_API ZkVec2f ZkVisualDecal_getOffset(ZkVisualDecal const* slf);
ZKC_API ZkBool ZkVisualDecal_getTwoSided(ZkVisualDecal const* slf);
ZKC_API ZkAlphaFunction ZkVisualDecal_getAlphaFunc(ZkVisualDecal const* slf);
ZKC_API float ZkVisualDecal_getTextureAnimFps(ZkVisualDecal const* slf);
ZKC_API uint8_t ZkVisualDecal_getAlphaWeight(ZkVisualDecal const* slf);
ZKC_API ZkBool ZkVisualDecal_getIgnoreDaylight(ZkVisualDecal const* slf);
18 changes: 9 additions & 9 deletions src/vobs/VirtualObject.cc
Original file line number Diff line number Diff line change
Expand Up @@ -174,47 +174,47 @@ ZkString ZkVisual_getName(ZkVisual const* slf) {
return slf->name.c_str();
}

ZkVisualType ZkVisual_getType(ZkVisual const* slf) {
ZkVisualType ZkVisualVisual_getType(ZkVisual const* slf) {
ZKC_CHECK_NULL(slf);
return static_cast<ZkVisualType>(slf->type);
}

ZkString ZkDecal_getName(ZkDecal const* slf) {
ZkString ZkVisualDecal_getName(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->name.c_str();
}

ZkVec2f ZkDecal_getDimension(ZkDecal const* slf) {
ZkVec2f ZkVisualDecal_getDimension(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->dimension;
}

ZkVec2f ZkDecal_getOffset(ZkDecal const* slf) {
ZkVec2f ZkVisualDecal_getOffset(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->offset;
}

ZkBool ZkDecal_getTwoSided(ZkDecal const* slf) {
ZkBool ZkVisualDecal_getTwoSided(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->two_sided;
}

ZkAlphaFunction ZkDecal_getAlphaFunc(ZkDecal const* slf) {
ZkAlphaFunction ZkVisualDecal_getAlphaFunc(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return static_cast<ZkAlphaFunction>(slf->alpha_func);
}

float ZkDecal_getTextureAnimFps(ZkDecal const* slf) {
float ZkVisualDecal_getTextureAnimFps(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->texture_anim_fps;
}

uint8_t ZkDecal_getAlphaWeight(ZkDecal const* slf) {
uint8_t ZkVisualDecal_getAlphaWeight(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->alpha_weight;
}

ZkBool ZkDecal_getIgnoreDaylight(ZkDecal const* slf) {
ZkBool ZkVisualDecal_getIgnoreDaylight(ZkVisualDecal const* slf) {
ZKC_CHECK_NULL(slf);
return slf->ignore_daylight;
}

0 comments on commit 5c83f70

Please sign in to comment.