git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 12:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

wasm: improved bounds calculation (#795)

Browse source 
Improved bounds calculation in case a rotation is applied
This commit is contained in:
Michal Maciola 2021-09-10 13:26:58 +02:00 • committed by GitHub
parent 8c2e762e98
commit e62f8a0db4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/wasm/thorvgwasm.cpp
View file

@ -178,20 +178,27 @@ public:
const Paint* paint = findPaintById(mPicture, paintId, &parents); const Paint* paint = findPaintById(mPicture, paintId, &parents);
if (!paint) return val(typed_memory_view<float>(0, nullptr)); if (!paint) return val(typed_memory_view<float>(0, nullptr));
paint->bounds(&mBounds[0], &mBounds[1], &mBounds[2], &mBounds[3]); paint->bounds(&mBounds[0], &mBounds[1], &mBounds[2], &mBounds[3]);
mBounds[2] += mBounds[0]; float points[8] = { //clockwise points
mBounds[3] += mBounds[1]; mBounds[0], mBounds[1], //(x1, y1)
mBounds[0] + mBounds[2], mBounds[1], //(x2, y1)
mBounds[0] + mBounds[2], mBounds[1] + mBounds[3], //(x2, y2)
mBounds[0], mBounds[1] + mBounds[3], //(x1, y2)
};
for (auto paint = parents.data; paint < (parents.data + parents.count); ++paint) { for (auto paint = parents.data; paint < (parents.data + parents.count); ++paint) {
auto m = const_cast<Paint*>(*paint)->transform(); auto m = const_cast<Paint*>(*paint)->transform();
mBounds[0] = mBounds[0] * m.e11 + m.e13; for (int i = 0; i<8; i += 2) {
mBounds[1] = mBounds[1] * m.e22 + m.e23; float x = points[i] * m.e11 + points[i+1] * m.e12 + m.e13;
mBounds[2] = mBounds[2] * m.e11 + m.e13; points[i+1] = points[i] * m.e21 + points[i+1] * m.e22 + m.e23;
mBounds[3] = mBounds[3] * m.e22 + m.e23; points[i] = x;
}
} }
mBounds[2] -= mBounds[0]; mBounds[0] = points[0];//x(p1)
mBounds[3] -= mBounds[1]; mBounds[1] = points[3];//y(p2)
mBounds[2] = points[4] - mBounds[0];//x(p3)
mBounds[3] = points[7] - mBounds[1];//y(p4)
return val(typed_memory_view(4, mBounds)); return val(typed_memory_view(4, mBounds));
} }
@ -299,7 +306,7 @@ private:
float mOriginalSize[2]; float mOriginalSize[2];
}; };
// Binding code //Binding code
EMSCRIPTEN_BINDINGS(thorvg_bindings) { EMSCRIPTEN_BINDINGS(thorvg_bindings) {
class_<ThorvgWasm>("ThorvgWasm") class_<ThorvgWasm>("ThorvgWasm")
.constructor(&ThorvgWasm::create) .constructor(&ThorvgWasm::create)