Grid modify tool can now change offset and size of grid
This commit is contained in:
parent
e16b0f1081
commit
dcfebcf6f4
4 changed files with 43 additions and 3 deletions
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
DrawCamera::DrawCamera():
|
DrawCamera::DrawCamera():
|
||||||
//c({0, 0}, WorldScalar(1000), 0.0)
|
//c({0, 0}, WorldScalar(1000), 0.0)
|
||||||
c({"1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}, WorldScalar(100e100), 0.0)
|
c({"1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"}, WorldScalar("1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"), 0.0)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
void DrawCamera::set_based_on_properties(World& w, const WorldVec& newPos, const WorldScalar& newZoom, double newRotate) {
|
void DrawCamera::set_based_on_properties(World& w, const WorldVec& newPos, const WorldScalar& newZoom, double newRotate) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "../DrawData.hpp"
|
#include "../DrawData.hpp"
|
||||||
#include "DrawingProgramCache.hpp"
|
#include "DrawingProgramCache.hpp"
|
||||||
|
#include "GridModifyTool.hpp"
|
||||||
#include "cereal/archives/portable_binary.hpp"
|
#include "cereal/archives/portable_binary.hpp"
|
||||||
#include <include/core/SkCanvas.h>
|
#include <include/core/SkCanvas.h>
|
||||||
#include <include/core/SkPath.h>
|
#include <include/core/SkPath.h>
|
||||||
|
|
@ -125,4 +126,5 @@ class DrawingProgram {
|
||||||
friend class DrawingProgramSelection;
|
friend class DrawingProgramSelection;
|
||||||
friend class LassoSelectTool;
|
friend class LassoSelectTool;
|
||||||
friend class GridEditTool;
|
friend class GridEditTool;
|
||||||
|
friend class GridModifyTool;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,37 @@ void GridModifyTool::gui_toolbox() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void GridModifyTool::tool_update() {
|
void GridModifyTool::tool_update() {
|
||||||
|
auto gridFoundIt = drawP.world.gridMan.grids.find(gridName);
|
||||||
|
if(gridFoundIt != drawP.world.gridMan.grids.end()) {
|
||||||
|
WorldGrid& g = gridFoundIt->second;
|
||||||
|
switch(selectionMode) {
|
||||||
|
case 0: {
|
||||||
|
if(drawP.controls.leftClick) {
|
||||||
|
Vector2f gOffsetScreenPos = drawP.world.drawData.cam.c.to_space(g.offset);
|
||||||
|
Vector2f gSizeScreenPos = drawP.world.drawData.cam.c.to_space(g.offset + WorldVec{g.size, 0});
|
||||||
|
if(SCollision::collide(SCollision::Circle(gOffsetScreenPos, DRAG_POINT_RADIUS), drawP.world.main.input.mouse.pos))
|
||||||
|
selectionMode = 1;
|
||||||
|
else if(SCollision::collide(SCollision::Circle(gSizeScreenPos, DRAG_POINT_RADIUS), drawP.world.main.input.mouse.pos))
|
||||||
|
selectionMode = 2;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 1: {
|
||||||
|
g.offset = drawP.world.get_mouse_world_pos();
|
||||||
|
if(!drawP.controls.leftClickHeld)
|
||||||
|
selectionMode = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case 2: {
|
||||||
|
g.size = std::max(FixedPoint::abs(drawP.world.get_mouse_world_pos().x() - g.offset.x()), WorldScalar(1));
|
||||||
|
if(!drawP.controls.leftClickHeld)
|
||||||
|
selectionMode = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
selectionMode = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GridModifyTool::prevent_undo_or_redo() {
|
bool GridModifyTool::prevent_undo_or_redo() {
|
||||||
|
|
@ -74,8 +105,14 @@ void GridModifyTool::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
auto gridFoundIt = drawP.world.gridMan.grids.find(gridName);
|
auto gridFoundIt = drawP.world.gridMan.grids.find(gridName);
|
||||||
if(gridFoundIt != drawP.world.gridMan.grids.end()) {
|
if(gridFoundIt != drawP.world.gridMan.grids.end()) {
|
||||||
WorldGrid& g = gridFoundIt->second;
|
WorldGrid& g = gridFoundIt->second;
|
||||||
Vector2f gOffset = drawData.cam.c.to_space(g.offset);
|
if(selectionMode == 0 || selectionMode == 2) {
|
||||||
canvas->drawCircle(gOffset.x(), gOffset.y(), 5.0f, SkPaint{SkColor4f{1.0f, 0.0f, 0.0f, 1.0f}});
|
Vector2f gSizeScreenPos = drawData.cam.c.to_space(g.offset + WorldVec{g.size, 0});
|
||||||
|
drawP.draw_drag_circle(canvas, gSizeScreenPos, {0.1f, 0.9f, 0.9f, 1.0f}, drawData);
|
||||||
|
}
|
||||||
|
if(selectionMode == 0 || selectionMode == 1) {
|
||||||
|
Vector2f gOffset = drawData.cam.c.to_space(g.offset);
|
||||||
|
drawP.draw_drag_circle(canvas, gOffset, {1.0f, 0.27f, 0.27f, 1.0f}, drawData);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,4 +15,5 @@ class GridModifyTool : public DrawingProgramToolBase {
|
||||||
virtual void switch_tool(DrawingProgramToolType newTool) override;
|
virtual void switch_tool(DrawingProgramToolType newTool) override;
|
||||||
private:
|
private:
|
||||||
std::string gridName;
|
std::string gridName;
|
||||||
|
unsigned selectionMode = 0;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue