vmario/Doodle3D-Core
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Core.git synced 2024-12-22 19:13:49 +01:00
Code Issues Projects Releases Wiki Activity

increase hit area of text shapes

Browse Source 
Hit area of text shapes is now the boundingbox
This commit is contained in:
casperlamboo 2018-01-09 11:53:12 +01:00
parent 1464a4b74f
commit 2b5d240487
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/d2/tools/BaseTool.js
View File

@ -8,7 +8,7 @@ import { shapeToPoints } from '../../shape/shapeToPoints';
import { LINE_COLLISION_MARGIN } from '../../constants/d2Constants'; import { LINE_COLLISION_MARGIN } from '../../constants/d2Constants';
import { LINE_WIDTH } from '../../constants/d2Constants'; import { LINE_WIDTH } from '../../constants/d2Constants';
import { PIXEL_RATIO } from '../../constants/general'; import { PIXEL_RATIO } from '../../constants/general';
import { Matrix } from 'cal'; import { Matrix, Vector } from 'cal';
const HIT_ORDER = { const HIT_ORDER = {
RECT: 0, RECT: 0,
@ -132,8 +132,20 @@ export default class BaseTool extends EventGroup {
const objects = shapeDatas const objects = shapeDatas
.filter(shapeData => { .filter(shapeData => {
const shapeMatrix = shapeData.transform.multiplyMatrix(matrix); const shapeMatrix = shapeData.transform.multiplyMatrix(matrix);
let shapePoints = shapeToPoints(shapeData);
const isHit = shapeToPoints(shapeData) if (shapeData.type === 'TEXT') {
if (shapeData.text.text === '') return false;
const { min, max } = getPointsBounds(shapePoints);
shapePoints = [{ points: [
new Vector(min.x, min.y),
new Vector(min.x, max.y),
new Vector(max.x, max.y),
new Vector(max.x, min.y)
], holes: [] }];
}
const isHit = shapePoints
.some(({ points, holes }) => { .some(({ points, holes }) => {
const shape = applyMatrixOnShape([points, ...holes], shapeMatrix); const shape = applyMatrixOnShape([points, ...holes], shapeMatrix);
const clipperShape = new ClipperShape(shape, shapeData.fill, true, true); const clipperShape = new ClipperShape(shape, shapeData.fill, true, true);