Reverted AffineTransform.concat() implementation with ktm. [skip CI]

IppClub · Nov 26, 2024 · 6d6141a · 6d6141a
1 parent 1499d81
commit 6d6141a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/Source/3rdParty/ktm/simd/skv.h b/Source/3rdParty/ktm/simd/skv.h
@@ -20,8 +20,8 @@ namespace skv
     typedef float32x4_t fv4;
     typedef int32x4_t sv4;
 #elif KTM_SIMD_ENABLE(KTM_SIMD_SSE)
-    typedef __m64 fv2;
-    typedef __m64 sv2;
+    typedef uint64_t fv2;
+    typedef uint64_t sv2;
     typedef __m128 fv4;
     #if KTM_SIMD_ENABLE(KTM_SIMD_SSE2)
        typedef __m128i sv4; 

diff --git a/Source/3rdParty/nanovg/nanovg.cpp b/Source/3rdParty/nanovg/nanovg.cpp
@@ -728,6 +728,11 @@ void nvgTransform(NVGcontext* ctx, float a, float b, float c, float d, float e,
 	nvgTransformPremultiply(state->xform, t);
 }
 
+void nvgSetTransform(NVGcontext* ctx, float xform[6]) {
+	NVGstate* state = nvg__getState(ctx);
+	memcpy(state->xform, xform, sizeof(xform[0]) * 6);
+}
+
 void nvgResetTransform(NVGcontext* ctx)
 {
 	NVGstate* state = nvg__getState(ctx);

diff --git a/Source/3rdParty/nanovg/nanovg.h b/Source/3rdParty/nanovg/nanovg.h
@@ -301,6 +301,8 @@ void nvgResetTransform(NVGcontext* ctx);
 //   [0 0 1]
 void nvgTransform(NVGcontext* ctx, float a, float b, float c, float d, float e, float f);
 
+void nvgSetTransform(NVGcontext* ctx, float xform[6]);
+
 // Translates current coordinate system.
 void nvgTranslate(NVGcontext* ctx, float x, float y);
 

diff --git a/Source/Render/VGRender.cpp b/Source/Render/VGRender.cpp
@@ -199,9 +199,8 @@ void nvg::ApplyTransform(NotNull<Node, 1> node) {
 	transform.translate(size.width / 2, size.height / 2);
 	transform.scale(1.0f / scale, -1.0f / scale);
 	const auto& world = node->getWorld();
-	nvgResetTransform(Context());
-	nvgTransform(Context(), transform.a, transform.b, transform.c, transform.d, transform.tx, transform.ty);
-	nvgTransform(Context(), world.m[0], world.m[1], world.m[4], world.m[5], world.m[12], world.m[13]);
+	transform.concat({world.m[0], world.m[1], world.m[4], world.m[5], world.m[12], world.m[13]});
+	nvgSetTransform(Context(), &transform.a);
 }
 
 void nvg::Translate(float x, float y) {

diff --git a/Source/Support/Geometry.cpp b/Source/Support/Geometry.cpp
@@ -385,13 +385,7 @@ AffineTransform& AffineTransform::scale(float sx, float sy) {
 }
 
 AffineTransform& AffineTransform::concat(const AffineTransform& t2) {
-	*this = {
-		a * t2.a + b * t2.c,
-		a * t2.b + b * t2.d,
-		c * t2.a + d * t2.c,
-		c * t2.b + d * t2.d,
-		tx * t2.a + ty * t2.c + t2.tx,
-		tx * t2.b + ty * t2.d + t2.ty};
+	r_cast<ktm::faffine2d*>(this)->concat(r_cast<const ktm::faffine2d&>(t2));
 	return *this;
 }