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

update widgets

Browse source
This commit is contained in:
IlyaShurupov 2024-05-06 16:33:35 +03:00 • committed by Ilya Shurupov
parent 1767b65c7e
commit 35cb553ecb
24 changed files with 284 additions and 370 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Sketch3D/applications/Entry.cpp
View file

@ -13,11 +13,14 @@ public:
void processFrame(EventHandler* eventHandler) override {
auto rec = RectF({ 0, 0 }, mWindow->getSize());
mGui.updateConfigCache(mWidgetManager);
mGui.proc(*eventHandler, rec, rec);
mGui.setVisible(true);
mGui.setArea(rec);
mGui.updateConfigWrapper(mWidgetManager);
mGui.procWrapper(*eventHandler);
}
void drawFrame(Canvas* canvas) override { mGui.draw(*canvas); }
void drawFrame(Canvas* canvas) override { mGui.drawWrapper(*canvas); }
private:
WidgetManager mWidgetManager;

6
Sketch3D/private/Sketch3D.cpp
View file

@ -66,7 +66,7 @@ void Stroke::compress(halnf factor) {
min_node = nullptr;
halnf min_factor = factor;
List<StrokePoint>::Node* iter = passed_poits.first()->next;
List<StrokePoint>::Node* iter = passed_poits.firstNode()->next;
for (; iter->next; iter = iter->next) {
Vec3F dir1 = (iter->data.pos - iter->prev->data.pos).normalize();
Vec3F dir2 = (iter->next->data.pos - iter->data.pos).normalize();
@ -111,7 +111,7 @@ void Stroke::subdiv(halnf precision, const Camera* cam, halni passes) {
auto n_points = new_points.length();
auto p0 = new_points.first();
auto p0 = new_points.firstNode();
auto p1 = p0->next;
auto p2 = p1->next;
auto p3 = p2->next;
@ -234,7 +234,7 @@ void PencilBrush::sample(Project* proj, Vec2F crs, halnf pressure) {
mStroke = new Stroke();
mStroke->setColor(mCol);
mStroke->getPoints().append(proj->mLayers[proj->mActiveLayer]->strokes.last()->data->getPoints().last());
mStroke->getPoints().append(proj->mLayers[proj->mActiveLayer]->strokes.last()->getPoints().last());
}
if (!pressure) {

51
Sketch3D/public/Sketch3DWidget.hpp
View file

@ -18,12 +18,7 @@ namespace tp {
~Sketch3DWidget() { mCanvas->deleteImageHandle(mImage); }
void proc(const Events& events, const RectF& areaParent, const RectF& area) override {
this->mArea = area;
this->mVisible = area.isOverlap(areaParent);
if (!this->mVisible) return;
void procCallback(const Events& events) override {
if (!this->mArea.isInside(events.getPointer())) {
return;
}
@ -76,7 +71,7 @@ namespace tp {
mActionPosAbsolutePrev = absolutePos;
}
void drawBody(Canvas& canvas) override {
void drawCallback(Canvas& canvas) override {
mRenderer.renderToTexture(&mProject, this->mArea.size);
canvas.drawImage(this->mArea, &mImage, 0, 1, 12);
}
@ -106,31 +101,35 @@ namespace tp {
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);
mOptions.addWidget(mDrawButton);
mOptions.addWidget(mMoveButton);
mOptions.addWidget(mRotateButton);
mOptions.addWidget(mZoomButton);
// add color sliders
mRed = new NamedSliderWidget<Events, Canvas>("Red");
mGreen = new NamedSliderWidget<Events, Canvas>("Green");
mBlue = new NamedSliderWidget<Events, Canvas>("Blue");
mOptions.mContents.append(mRed);
mOptions.mContents.append(mGreen);
mOptions.mContents.append(mBlue);
mOptions.addWidget(mRed);
mOptions.addWidget(mGreen);
mOptions.addWidget(mBlue);
this->mChildWidgets.pushBack(&mViewport);
this->mChildWidgets.pushBack(&mSplitView);
this->mChildWidgets.pushBack(&mOptions);
}
~Sketch3DGUI() {
for (auto item : mOptions.mContents) {
for (auto item : mOptions.getContent()) {
delete item.data();
}
}
void procBody(const Events& events) override {
mSplitView.proc(events, this->mArea, this->mArea);
mViewport.proc(events, this->mArea, mSplitView.getFirst());
mOptions.proc(events, this->mArea, mSplitView.getSecond());
void procCallback(const Events& events) override {
mSplitView.setArea(this->mArea);
mViewport.setArea(mSplitView.getFirst());
mOptions.setArea(mSplitView.getSecond());
if (mDrawButton->mIsPressed) {
mViewport.mMode = Sketch3DWidget<Events, Canvas>::Mode::DRAW;
@ -145,23 +144,13 @@ namespace tp {
mViewport.setColor(RGBA(mRed->mSlider.mFactor, mGreen->mSlider.mFactor, mBlue->mSlider.mFactor, 1.f));
}
void drawBody(Canvas& canvas) override {
canvas.rect(this->mArea, mBackgroundColor, mRounding);
void drawCallback(Canvas& canvas) override { canvas.rect(this->mArea, mBackgroundColor, mRounding); }
mSplitView.draw(canvas);
mViewport.draw(canvas);
mOptions.draw(canvas);
}
void updateConfigCache(WidgetManager& wm) override {
void updateConfigCallback(WidgetManager& wm) override {
wm.setActiveId("Sketch3DGui");
mBackgroundColor = wm.getColor("Background", "Background");
mRounding = wm.getNumber("Rounding", "Rounding");
mSplitView.updateConfigCache(wm);
mOptions.updateConfigCache(wm);
mViewport.updateConfigCache(wm);
}
private: