Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EPMUII-8314-Plain-drawinf-tool-for-2D #188

Merged
merged 1 commit into from
Dec 20, 2023
Merged

EPMUII-8314-Plain-drawinf-tool-for-2D #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 92 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"daikon": "^1.2.42",
"jszip": "^3.10.1",
"react": "^17.0.2",
"react-color": "^2.19.3",
"react-dnd": "^14.0.2",
"react-dnd-html5-backend": "^14.0.0",
"react-dom": "^17.0.2",
Expand Down
10 changes: 9 additions & 1 deletion public/sprite.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 24 additions & 4 deletions src/engine/Graphics2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { connect } from 'react-redux';
import Modes2d from '../store/Modes2d';
import StoreActionType from '../store/ActionTypes';
import ToolPick from './tools2d/ToolPick';
import ToolPaint from './tools2d/ToolPaint';
import ToolDistance from './tools2d/ToolDistance';
import ToolAngle from './tools2d/ToolAngle';
import ToolArea from './tools2d/ToolArea';
Expand Down Expand Up @@ -71,6 +72,7 @@ class Graphics2d extends React.Component {

// tools2d
this.m_toolPick = new ToolPick(this);
this.m_toolPaint = new ToolPaint(this);
this.m_toolDistance = new ToolDistance(this);
this.m_toolAngle = new ToolAngle(this);
this.m_toolArea = new ToolArea(this);
Expand Down Expand Up @@ -205,6 +207,7 @@ class Graphics2d extends React.Component {
// console.log(`gra2d. render: wScreen*hScreen = ${wScreen} * ${hScreen}, but w*h=${w}*${h} `);

this.m_toolPick.setScreenDim(wScreen, hScreen);
this.m_toolPaint.setScreenDim(wScreen, hScreen);
this.m_toolDistance.setScreenDim(wScreen, hScreen);
this.m_toolAngle.setScreenDim(wScreen, hScreen);
this.m_toolArea.setScreenDim(wScreen, hScreen);
Expand Down Expand Up @@ -296,6 +299,7 @@ class Graphics2d extends React.Component {
// console.log(`gra2d. render: wScreen*hScreen = ${wScreen} * ${hScreen}, but w*h=${w}*${h} `);

this.m_toolPick.setScreenDim(wScreen, hScreen);
this.m_toolPaint.setScreenDim(wScreen, hScreen);
this.m_toolDistance.setScreenDim(wScreen, hScreen);
this.m_toolAngle.setScreenDim(wScreen, hScreen);
this.m_toolArea.setScreenDim(wScreen, hScreen);
Expand Down Expand Up @@ -390,6 +394,7 @@ class Graphics2d extends React.Component {
// console.log(`gra2d. render: wScreen*hScreen = ${wScreen} * ${hScreen}, but w*h=${w}*${h} `);

this.m_toolPick.setScreenDim(wScreen, hScreen);
this.m_toolPaint.setScreenDim(wScreen, hScreen);
this.m_toolDistance.setScreenDim(wScreen, hScreen);
this.m_toolAngle.setScreenDim(wScreen, hScreen);
this.m_toolArea.setScreenDim(wScreen, hScreen);
Expand Down Expand Up @@ -539,6 +544,7 @@ class Graphics2d extends React.Component {
})
.then(() => {
this.m_toolPick.render(ctx);
this.m_toolPaint.render(ctx, store);
this.m_toolDistance.render(ctx, store);
this.m_toolAngle.render(ctx, store);
this.m_toolArea.render(ctx, store);
Expand Down Expand Up @@ -566,10 +572,10 @@ class Graphics2d extends React.Component {
xPosNew = mouseX - (mouseX - store.render2dxPos) * (newZoom / zoom);
yPosNew = mouseY - (mouseY - store.render2dyPos) * (newZoom / zoom);
} else {
const initialX = canvasRect.width * zoom + store.render2dxPos;
const initialY = canvasRect.height * zoom + store.render2dyPos;
xPosNew = initialX - (initialX - store.render2dxPos) * (newZoom / zoom);
yPosNew = initialY - (initialY - store.render2dyPos) * (newZoom / zoom);
const centerX = (canvasRect.width * newZoom) / 2 + store.render2dxPos;
const centerY = (canvasRect.height * newZoom) / 2 + store.render2dyPos;
xPosNew = centerX - (centerX - store.render2dxPos) * (newZoom / zoom);
yPosNew = centerY - (centerY - store.render2dyPos) * (newZoom / zoom);
}

if (xPosNew < 0) {
Expand Down Expand Up @@ -600,6 +606,13 @@ class Graphics2d extends React.Component {

this.setState({ stateMouseDown: false });

if (indexTools2d === Tools2dType.PAINT) {
const store = this.props;
const box = this.m_mount.current.getBoundingClientRect();
const xScr = evt.clientX - box.left;
const yScr = evt.clientY - box.top;
this.m_toolPaint.onMouseUp(xScr, yScr, store);
}
if (indexTools2d === Tools2dType.DISTANCE) {
const store = this.props;
const box = this.m_mount.current.getBoundingClientRect();
Expand Down Expand Up @@ -660,6 +673,9 @@ class Graphics2d extends React.Component {
const xScr = xContainer;
const yScr = yContainer;

if (indexTools2d === Tools2dType.PAINT) {
this.m_toolPaint.onMouseMove(xScr, yScr, store);
}
if (indexTools2d === Tools2dType.DISTANCE) {
this.m_toolDistance.onMouseMove(xScr, yScr, store);
}
Expand Down Expand Up @@ -718,6 +734,9 @@ class Graphics2d extends React.Component {
case Tools2dType.INTENSITY:
this.m_toolPick.onMouseDown(xScr, yScr, store);
break;
case Tools2dType.PAINT:
this.m_toolPaint.onMouseDown(xScr, yScr, store);
break;
case Tools2dType.DISTANCE:
this.m_toolDistance.onMouseDown(xScr, yScr, store);
break;
Expand Down Expand Up @@ -754,6 +773,7 @@ class Graphics2d extends React.Component {
* Invoke clear all tools
*/
clear() {
this.m_toolPaint.clear();
this.m_toolDistance.clear();
this.m_toolAngle.clear();
this.m_toolArea.clear();
Expand Down
3 changes: 2 additions & 1 deletion src/engine/tools2d/ToolDelete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,13 @@ class ToolDelete {
y: yScr,
};

const toolPaint = this.m_objGraphics2d.m_toolPaint;
const toolDist = this.m_objGraphics2d.m_toolDistance;
const toolAngle = this.m_objGraphics2d.m_toolAngle;
const toolArea = this.m_objGraphics2d.m_toolArea;
const toolRect = this.m_objGraphics2d.m_toolRect;
const toolText = this.m_objGraphics2d.m_toolText;
const tools = [toolDist, toolAngle, toolArea, toolRect, toolText];
const tools = [toolPaint, toolDist, toolAngle, toolArea, toolRect, toolText];
const trackedBefore = this.m_pointTracked !== null;
this.m_pointTracked = null;
const numTools = tools.length;
Expand Down
Loading
Loading