Skip to content
This repository has been archived by the owner on Sep 28, 2023. It is now read-only.

Commit

Permalink
new TextField align. Some changes in Matrix2x3 and ColorTransform.
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniil-SV committed Apr 3, 2023
1 parent 4334731 commit 2a5bd24
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 68 deletions.
126 changes: 83 additions & 43 deletions bindings/SupercellFlashNapi/objects/TextField.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace scNapi
Utils::initializeClass<sc::TextField>(this, info);
};

/*
/*
& Id
*/

Expand All @@ -66,219 +66,259 @@ namespace scNapi
& Text
*/

void TextField::set_Text(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_Text(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->text(ToNativeValue<std::string>(value));
}
Napi::Value TextField::get_Text(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_Text(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->text());
}

/*
& Font name
*/

void TextField::set_FontName(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_FontName(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->fontName(ToNativeValue<std::string>(value));
}
Napi::Value TextField::get_FontName(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_FontName(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->fontName());
}

/*
& Font color
*/

void TextField::set_FontColor(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_FontColor(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->fontColor(ToNativeValue<uint32_t>(value));
}
Napi::Value TextField::get_FontColor(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_FontColor(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->fontColor());
}

/*
& Font size
*/

void TextField::set_FontSize(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_FontSize(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->fontSize(ToNativeValue<uint8_t>(value));
}
Napi::Value TextField::get_FontSize(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_FontSize(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->fontSize());
}

/*
& Font align
*/

void TextField::set_FontAlign(const Napi::CallbackInfo& info, const Napi::Value& value) {
parent->fontAlign(ToNativeValue<uint8_t>(value));
void TextField::set_FontAlign(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->fontAlign((sc::TextField::Align)ToNativeValue<uint8_t>(value));
}
Napi::Value TextField::get_FontAlign(const Napi::CallbackInfo& info) {
return ToJSValue(info, parent->fontAlign());
Napi::Value TextField::get_FontAlign(const Napi::CallbackInfo& info)
{
return ToJSValue(info, (uint8_t)parent->fontAlign());
}

/*
& Left
*/

void TextField::set_Left(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_Left(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->left(ToNativeValue<uint16_t>(value));
}
Napi::Value TextField::get_Left(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_Left(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->left());
}

/*
& Top
*/

void TextField::set_Top(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_Top(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->top(ToNativeValue<uint16_t>(value));
}
Napi::Value TextField::get_Top(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_Top(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->top());
}

/*
& Right
*/

void TextField::set_Right(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_Right(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->right(ToNativeValue<uint16_t>(value));
}
Napi::Value TextField::get_Right(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_Right(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->right());
}

/*
& Bottom
*/

void TextField::set_Bottom(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_Bottom(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->bottom(ToNativeValue<uint16_t>(value));
}
Napi::Value TextField::get_Bottom(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_Bottom(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->bottom());
}

/*
& IsBold
*/

void TextField::set_IsBold(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_IsBold(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->isBold(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_IsBold(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_IsBold(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->isBold());
}

/*
& IsItalic
*/

void TextField::set_IsItalic(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_IsItalic(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->isItalic(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_IsItalic(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_IsItalic(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->isItalic());
}

/*
& IsMultiline
*/

void TextField::set_IsMultiline(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_IsMultiline(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->isMultiline(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_IsMultiline(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_IsMultiline(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->isMultiline());
}

/*
& IsOutlined
*/

void TextField::set_IsOutlined(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_IsOutlined(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->isOutlined(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_IsOutlined(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_IsOutlined(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->isOutlined());
}

/*
& IsDynamic
*/

void TextField::set_IsDynamic(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_IsDynamic(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->isDynamic(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_IsDynamic(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_IsDynamic(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->isDynamic());
}

/*
& UseDeviceFont
*/

void TextField::set_OutlineColor(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_OutlineColor(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->outlineColor(ToNativeValue<uint32_t>(value));
}
Napi::Value TextField::get_OutlineColor(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_OutlineColor(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->outlineColor());
}

/*
& UseDeviceFont
*/

void TextField::set_UseDeviceFont(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_UseDeviceFont(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->useDeviceFont(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_UseDeviceFont(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_UseDeviceFont(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->useDeviceFont());
}

/*
& AdjustFontBounds
*/

void TextField::set_AutoAdjustFontSize(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_AutoAdjustFontSize(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->autoAdjustFontSize(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_AutoAdjustFontSize(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_AutoAdjustFontSize(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->autoAdjustFontSize());
}

/*
& unknownFlag
*/

void TextField::set_UnknownFlag(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_UnknownFlag(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->unknownFlag(ToNativeValue<bool>(value));
}
Napi::Value TextField::get_UnknownFlag(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_UnknownFlag(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->unknownFlag());
}

/*
& unknownShort
*/

void TextField::set_UnknownShort(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_UnknownShort(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->unknownShort(ToNativeValue<uint16_t>(value));
}
Napi::Value TextField::get_UnknownShort(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_UnknownShort(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->unknownShort());
}

/*
& unknownShort2
*/

void TextField::set_UnknownShort2(const Napi::CallbackInfo& info, const Napi::Value& value) {
void TextField::set_UnknownShort2(const Napi::CallbackInfo& info, const Napi::Value& value)
{
parent->unknownShort2(ToNativeValue<uint16_t>(value));
}
Napi::Value TextField::get_UnknownShort2(const Napi::CallbackInfo& info) {
Napi::Value TextField::get_UnknownShort2(const Napi::CallbackInfo& info)
{
return ToJSValue(info, parent->unknownShort2());
}

Expand Down
2 changes: 1 addition & 1 deletion bindings/SupercellFlashNapi/objects/TextField.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace scNapi
}

if (object.Has("fontAlign")){
parent->fontAlign(ToNativeValue<uint8_t>(object.Get("fontAlign")));
parent->fontAlign((sc::TextField::Align)ToNativeValue<uint8_t>(object.Get("fontAlign")));
}

if (object.Has("left")){
Expand Down
14 changes: 2 additions & 12 deletions bindings/SupercellFlashNapi/transformation/ColorTransform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,8 @@ namespace scNapi
Napi::Value ColorTransform::equal(const Napi::CallbackInfo& info)
{
sc::ColorTransform* color = ColorTransform::Unwrap(info[0].ToObject())->get_parent();

if (floatEqual(color->alpha, parent->alpha) &&
floatEqual(color->blueAdd, parent->blueAdd) &&
floatEqual(color->blueMul, parent->blueMul) &&
floatEqual(color->greenAdd, parent->greenAdd) &&
floatEqual(color->greenMul, parent->greenMul) &&
floatEqual(color->redAdd, parent->redAdd) &&
floatEqual(color->redMul, parent->redMul)) {
return ToJSValue(info, true);
}

return ToJSValue(info, false);
bool res = parent->equal(*color);
return ToJSValue(info, res);
}

/* Red add */
Expand Down
11 changes: 2 additions & 9 deletions bindings/SupercellFlashNapi/transformation/Matrix2x3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@ namespace scNapi
Napi::Value Matrix2x3::equal(const Napi::CallbackInfo& info) {
sc::Matrix2x3* matrix = Matrix2x3::Unwrap(info[0].ToObject())->get_parent();

if (floatEqual(parent->a, matrix->a) &&
floatEqual(parent->b, matrix->b) &&
floatEqual(parent->c, matrix->c) &&
floatEqual(parent->d, matrix->d) &&
floatEqual(parent->tx, matrix->tx) &&
floatEqual(parent->ty, matrix->ty)) {
return ToJSValue(info, true);
}
bool res = parent->equal(*matrix);

return ToJSValue(info, false);
return ToJSValue(info, res);
}

/*
Expand Down
2 changes: 1 addition & 1 deletion deps/SC
Submodule SC updated from 075e02 to 7721b1
1 change: 1 addition & 0 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export {
ShapeDrawBitmapCommand,
ShapeDrawCommandVertex,
TextField,
TextFieldAlign,
MatrixBank,
Matrix2x3,
ColorTransform,
Expand Down
Loading

0 comments on commit 2a5bd24

Please # to comment.