ilusha/Modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adding new gui to Sketch3d

Browse source
This commit is contained in:
IlyaShurupov 2024-03-18 14:37:39 +03:00 • committed by Ilya Shurupov
parent 8eae09591d
commit e0f92b32dc
6 changed files with 134 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Sketch3D/applications/Entry.cpp
View file

@ -13,7 +13,7 @@ void runApp() {
auto window = tp::Window::createWindow(800, 600, "Window 1");
{
tp::Sketch3DWidget<tp::Window::Events, tp::Graphics::Canvas> gui(window->getCanvas(), {1800, 1000});
tp::Sketch3DGUI<tp::Window::Events, tp::Graphics::Canvas> gui(window->getCanvas(), {1920, 1080});
if (window) {
while (!window->shouldClose()) {
@ -47,5 +47,7 @@ int main() {
runApp();
// FIXME : leaks in stacktrace itself
binModule.deinitialize();
}

14
Sketch3D/public/Sketch3D.hpp
View file

@ -115,16 +115,16 @@ namespace tp {
class Brush {
public:
String mType = "equal";
Brush() {}
Brush() = default;
virtual void sample(Project* proj, Vec2F crs, halnf pressure) {}
virtual void draw(Renderer* render, const Camera* camera) {}
virtual ~Brush() {}
virtual ~Brush() = default;
};
class PencilBrush : public Brush {
public:
PencilBrush();
virtual ~PencilBrush();
~PencilBrush() override;
virtual void sample(Project* proj, Vec2F crs, halnf pressure) override;
virtual void draw(Renderer* render, const Camera* camera) override;
@ -147,14 +147,14 @@ namespace tp {
halni mMaxPoints = 100;
Stroke* mStroke = NULL;
Stroke* mStroke = nullptr;
Stroke mTempDisplayStroke;
};
struct EraserBrush : public Brush {
EraserBrush() { mType = "eraser"; }
virtual void sample(Project* proj, Vec2F crs, halnf pressure) override {}
virtual void draw(Renderer* render, const Camera* camera) override {}
virtual ~EraserBrush() {}
void sample(Project* proj, Vec2F crs, halnf pressure) override {}
void draw(Renderer* render, const Camera* camera) override {}
~EraserBrush() override = default;
};
}

107
Sketch3D/public/Sketch3DWidget.hpp
View file

@ -12,6 +12,8 @@ namespace tp {
mRenderer(renderResolution) {
mImage = canvas.createImageFromTextId(mRenderer.getBuff()->texId(), mRenderer.getBuff()->getSize());
mCanvas = &canvas;
mProject.mBackgroundColor = { 0.13f, 0.13f, 0.13f, 1.f };
}
~Sketch3DWidget() {
@ -33,9 +35,41 @@ namespace tp {
crs.y /= this->mArea.w;
crs = (crs - 0.5) * 2;
mProject.sample(events.pressure, this->mArea.w / this->mArea.z, crs);
// TODO : make better api for events
Vec2F absolutePos = events.getPos() - this->mArea.pos;
// mProject.setBackGroundColor();
if (events.isPressed()) {
mAction = true;
} else if (events.isReleased()) {
mAction = false;
}
Vec2F relativePos = ((absolutePos / this->mArea.size) - 0.5f) * 2.f;
Vec2F relativePosPrev = ((mActionPosAbsolutePrev / this->mArea.size) - 0.5f) * 2.f;
Vec2F relativeDelta = relativePos - relativePosPrev;
switch (mMode) {
case Mode::MOVE: {
if (mAction) mProject.mCamera.move(relativePos, relativePosPrev);
break;
}
case Mode::ZOOM: {
halnf factor = absolutePos.y / mActionPosAbsolutePrev.y;
if (mAction) mProject.mCamera.zoom(factor);
break;
}
case Mode::ROTATE: {
if (mAction) mProject.mCamera.rotate(-relativeDelta.x * halnf(PI), -relativeDelta.y * halnf(PI));
break;
}
case Mode::DRAW: {
mProject.sample(events.pressure, this->mArea.w / this->mArea.z, crs);
break;
}
default: break;
}
mActionPosAbsolutePrev = absolutePos;
}
void draw(Canvas& canvas) override {
@ -44,10 +78,79 @@ namespace tp {
canvas.drawImage(this->mArea, &mImage, 0, 1, 12);
}
public:
enum class Mode {
MOVE, ROTATE, ZOOM, DRAW, NONE
} mMode = Mode::NONE;
Vec2F mActionPosAbsolutePrev = { 0, 0 };
bool mAction = false;
private:
Renderer mRenderer;
Project mProject;
Canvas::ImageHandle mImage;
Canvas* mCanvas = nullptr;
};
template <typename Events, typename Canvas>
class Sketch3DGUI : public Widget<Events, Canvas> {
public:
Sketch3DGUI(Canvas& canvas, Vec2F renderResolution) : mViewport(canvas, renderResolution) {
this->createConfig("Sketch3D");
this->addColor("Background", "Background");
this->addValue("Rounding", "Rounding");
mDrawButton = new ButtonWidget<Events, Canvas>("Draw", { 0, 0, 100, 30 });
mMoveButton = new ButtonWidget<Events, Canvas>("Pan View", { 0, 0, 100, 30 });
mRotateButton = new ButtonWidget<Events, Canvas>("Rotate view", { 0, 0, 100, 30 });
mZoomButton = new ButtonWidget<Events, Canvas>("Zoom view", { 0, 0, 100, 30 });
mOptions.mContents.append(mDrawButton);
mOptions.mContents.append(mMoveButton);
mOptions.mContents.append(mRotateButton);
mOptions.mContents.append(mZoomButton);
}
void proc(const Events& events, const RectF& areaParent, const RectF& area) override {
this->mArea = area;
this->mVisible = area.isOverlap(areaParent);
if (!this->mVisible) return;
mSplitView.proc(events, this->mArea, this->mArea);
mViewport.proc(events, this->mArea, mSplitView.getFirst());
mOptions.proc(events, this->mArea, mSplitView.getSecond());
if (mDrawButton->mIsPressed) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::DRAW;
} else if (mMoveButton->mIsPressed) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::MOVE;
} else if (mRotateButton->mIsPressed) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::ROTATE;
} else if (mZoomButton->mIsPressed) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::ZOOM;
}
}
void draw(Canvas& canvas) override {
if (!this->mVisible) return;
canvas.rect(this->mArea, this->getColor("Background"), this->getValue("Rounding"));
mSplitView.draw(canvas);
mViewport.draw(canvas);
mOptions.draw(canvas);
}
private:
Sketch3DWidget<Events, Canvas> mViewport;
SplitView<Events, Canvas> mSplitView;
ScrollableWindow<Events, Canvas> mOptions;
ButtonWidget<Events, Canvas>* mDrawButton = nullptr;
ButtonWidget<Events, Canvas>* mMoveButton = nullptr;
ButtonWidget<Events, Canvas>* mRotateButton = nullptr;
ButtonWidget<Events, Canvas>* mZoomButton = nullptr;
};
}