From 1a67899bba6d5cab4661ecea6ed9972e518193fb Mon Sep 17 00:00:00 2001 From: Chronos Ouroboros Date: Sat, 19 Oct 2019 05:25:31 -0300 Subject: [PATCH] Added direct-native versions of the Shape2D linear transform API. --- src/rendering/2d/v_2ddrawer.cpp | 51 ++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/src/rendering/2d/v_2ddrawer.cpp b/src/rendering/2d/v_2ddrawer.cpp index 6cc59f4c0e..f36ee05c41 100644 --- a/src/rendering/2d/v_2ddrawer.cpp +++ b/src/rendering/2d/v_2ddrawer.cpp @@ -37,47 +37,72 @@ EXTERN_CVAR(Float, transsouls) IMPLEMENT_CLASS(DShape2DTransform, false, false) -DEFINE_ACTION_FUNCTION(DShape2DTransform, Clear) +static void Shape2DTransform_Clear(DShape2DTransform* self) +{ + self->transform.Identity(); +} + +DEFINE_ACTION_FUNCTION_NATIVE(DShape2DTransform, Clear, Shape2DTransform_Clear) { PARAM_SELF_PROLOGUE(DShape2DTransform); - self->transform.Identity(); + Shape2DTransform_Clear(self); return 0; } -DEFINE_ACTION_FUNCTION(DShape2DTransform, Rotate) +static void Shape2DTransform_Rotate(DShape2DTransform* self, double angle) +{ + self->transform = DMatrix3x3::Rotate2D(DEG2RAD(angle)) * self->transform; +} + +DEFINE_ACTION_FUNCTION_NATIVE(DShape2DTransform, Rotate, Shape2DTransform_Rotate) { PARAM_SELF_PROLOGUE(DShape2DTransform); PARAM_FLOAT(angle); - self->transform = DMatrix3x3::Rotate2D(DEG2RAD(angle)) * self->transform; + Shape2DTransform_Rotate(self, angle); return 0; } -DEFINE_ACTION_FUNCTION(DShape2DTransform, Scale) +static void Shape2DTransform_Scale(DShape2DTransform* self, double x, double y) { - PARAM_SELF_PROLOGUE(DShape2DTransform); - PARAM_FLOAT(x); - PARAM_FLOAT(y); self->transform = DMatrix3x3::Scale2D(DVector2(x, y)) * self->transform; - return 0; } -DEFINE_ACTION_FUNCTION(DShape2DTransform, Translate) +DEFINE_ACTION_FUNCTION_NATIVE(DShape2DTransform, Scale, Shape2DTransform_Scale) { PARAM_SELF_PROLOGUE(DShape2DTransform); PARAM_FLOAT(x); PARAM_FLOAT(y); + Shape2DTransform_Scale(self, x, y); + return 0; +} + +static void Shape2DTransform_Translate(DShape2DTransform* self, double x, double y) +{ self->transform = DMatrix3x3::Translate2D(DVector2(x, y)) * self->transform; +} + +DEFINE_ACTION_FUNCTION_NATIVE(DShape2DTransform, Translate, Shape2DTransform_Translate) +{ + PARAM_SELF_PROLOGUE(DShape2DTransform); + PARAM_FLOAT(x); + PARAM_FLOAT(y); + Shape2DTransform_Translate(self, x, y); return 0; } IMPLEMENT_CLASS(DShape2D, false, false) -DEFINE_ACTION_FUNCTION(DShape2D, SetTransform) +static void Shape2D_SetTransform(DShape2D* self, DShape2DTransform *transform) +{ + self->transform = transform->transform; + self->dirty = true; +} + +DEFINE_ACTION_FUNCTION_NATIVE(DShape2D, SetTransform, Shape2D_SetTransform) { PARAM_SELF_PROLOGUE(DShape2D); PARAM_OBJECT(transform, DShape2DTransform); - self->transform = transform->transform; - self->dirty = true; + Shape2D_SetTransform(self, transform); return 0; }