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

Unstable & with drawing restored

Browse source
This commit is contained in:
Ilusha 2024-03-17 23:37:15 +03:00 • committed by Ilya Shurupov
parent 1155067b26
commit cd8feaf2c0
15 changed files with 1004 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Sketch3D/public/Sketch3D.hpp
View file

@ -117,7 +117,7 @@ namespace tp {
String mType = "equal";
Brush() {}
virtual void sample(Project* proj, Vec2F crs, halnf pressure) {}
virtual void draw(Renderer* render, const Camera* camera) const {}
virtual void draw(Renderer* render, const Camera* camera) {}
virtual ~Brush() {}
};
@ -127,7 +127,7 @@ namespace tp {
virtual ~PencilBrush();
virtual void sample(Project* proj, Vec2F crs, halnf pressure) override;
virtual void draw(Renderer* render, const Camera* camera) const override;
virtual void draw(Renderer* render, const Camera* camera) override;
private:
void ensureReady(Stroke* stroke, const Camera* cam, bool debug = false) const;
@ -148,12 +148,13 @@ namespace tp {
halni mMaxPoints = 100;
Stroke* mStroke = NULL;
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) const override {}
virtual void draw(Renderer* render, const Camera* camera) override {}
virtual ~EraserBrush() {}
};
}

4
Sketch3D/public/Sketch3DWidget.hpp
View file

@ -28,14 +28,12 @@ namespace tp {
return;
}
halnf pressure = 0.f;
auto crs = (events.getPos() - this->mArea.pos);
crs.x /= this->mArea.z;
crs.y /= this->mArea.w;
crs = (crs - 0.5) * 2;
mProject.sample(pressure, this->mArea.w / this->mArea.z, crs);
mProject.sample(events.pressure, this->mArea.w / this->mArea.z, crs);
// mProject.setBackGroundColor();
}