mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-20 23:21:20 +02:00
Code Issues Projects Releases Wiki Activity

Move brushes further away from Renderer

Browse Source
This commit is contained in:
Tamás Bálint Misius
2024-08-20 18:43:35 +02:00
parent d5c2d87b2e
commit 7f60a44d1c
3 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gui/game/Brush.cpp
View File

@@ -1,5 +1,5 @@
#include "Brush.h" #include "Brush.h"
#include "graphics/Renderer.h" #include "graphics/Graphics.h"
Brush::Brush(const Brush &other) Brush::Brush(const Brush &other)
{ {
@@ -84,7 +84,7 @@ void Brush::AdjustSize(int delta, bool logarithmic, bool keepX, bool keepY)
SetRadius(newSize); SetRadius(newSize);
} }
void Brush::RenderRect(Renderer * ren, ui::Point position1, ui::Point position2) const void Brush::RenderRect(Graphics *g, ui::Point position1, ui::Point position2) const
{ {
int width, height; int width, height;
width = position2.X-position1.X; width = position2.X-position1.X;
@@ -100,35 +100,35 @@ void Brush::RenderRect(Renderer * ren, ui::Point position1, ui::Point position2)
width *= -1; width *= -1;
} }
ren->XorLine(position1, position1 + Vec2{ width, 0 }); g->XorLine(position1, position1 + Vec2{ width, 0 });
if (height > 0) if (height > 0)
{ {
ren->XorLine(position1 + Vec2{ 0, height }, position1 + Vec2{ width, height }); g->XorLine(position1 + Vec2{ 0, height }, position1 + Vec2{ width, height });
if (height > 1) if (height > 1)
{ {
ren->XorLine(position1 + Vec2{ width, 1 }, position1 + Vec2{ width, height - 1 }); g->XorLine(position1 + Vec2{ width, 1 }, position1 + Vec2{ width, height - 1 });
if (width > 0) if (width > 0)
{ {
ren->XorLine(position1 + Vec2{ 0, 1 }, position1 + Vec2{ 0, height - 1 }); g->XorLine(position1 + Vec2{ 0, 1 }, position1 + Vec2{ 0, height - 1 });
} }
} }
} }
} }
void Brush::RenderLine(Renderer * ren, ui::Point position1, ui::Point position2) const void Brush::RenderLine(Graphics *g, ui::Point position1, ui::Point position2) const
{ {
ren->XorLine(position1, position2); g->XorLine(position1, position2);
} }
void Brush::RenderPoint(Renderer * ren, ui::Point position) const void Brush::RenderPoint(Graphics *g, ui::Point position) const
{ {
ren->XorImage(&outline[0], RectBetween(position - radius, position + radius)); g->XorImage(&outline[0], RectBetween(position - radius, position + radius));
} }
void Brush::RenderFill(Renderer * ren, ui::Point position) const void Brush::RenderFill(Graphics *g, ui::Point position) const
{ {
ren->XorLine(position - Vec2{ 5, 0 }, position - Vec2{ 1, 0 }); g->XorLine(position - Vec2{ 5, 0 }, position - Vec2{ 1, 0 });
ren->XorLine(position + Vec2{ 5, 0 }, position + Vec2{ 1, 0 }); g->XorLine(position + Vec2{ 5, 0 }, position + Vec2{ 1, 0 });
ren->XorLine(position - Vec2{ 0, 5 }, position - Vec2{ 0, 1 }); g->XorLine(position - Vec2{ 0, 5 }, position - Vec2{ 0, 1 });
ren->XorLine(position + Vec2{ 0, 5 }, position + Vec2{ 0, 1 }); g->XorLine(position + Vec2{ 0, 5 }, position + Vec2{ 0, 1 });
} }

10
src/gui/game/Brush.h
View File

@@ -2,7 +2,7 @@
#include "gui/interface/Point.h" #include "gui/interface/Point.h"
#include <memory> #include <memory>
class Renderer; class Graphics;
class Brush class Brush
{ {
private: private:
@@ -82,10 +82,10 @@ public:
return iterator{*this, -radius.X, -radius.Y - 1}; return iterator{*this, -radius.X, -radius.Y - 1};
} }
void RenderRect(Renderer * ren, ui::Point position1, ui::Point position2) const; void RenderRect(Graphics *g, ui::Point position1, ui::Point position2) const;
void RenderLine(Renderer * ren, ui::Point position1, ui::Point position2) const; void RenderLine(Graphics *g, ui::Point position1, ui::Point position2) const;
void RenderPoint(Renderer * ren, ui::Point position) const; void RenderPoint(Graphics *g, ui::Point position) const;
void RenderFill(Renderer * ren, ui::Point position) const; void RenderFill(Graphics *g, ui::Point position) const;
void SetRadius(ui::Point newRadius); void SetRadius(ui::Point newRadius);
}; };

40
src/gui/game/GameView.cpp
View File

@@ -2141,6 +2141,11 @@ void GameView::OnDraw()
ren->RenderSimulation(); ren->RenderSimulation();
ren->sim = nullptr; ren->sim = nullptr;
ren->SetSample(c->PointTranslate(currentMouse)); ren->SetSample(c->PointTranslate(currentMouse));
c->AfterSimDraw();
std::copy_n(ren->Data(), ren->Size().X * ren->Size().Y, g->Data());
if (showBrush && selectMode == SelectNone && (!zoomEnabled || zoomCursorFixed) && activeBrush && (isMouseDown || (currentMouse.X >= 0 && currentMouse.X < XRES && currentMouse.Y >= 0 && currentMouse.Y < YRES))) if (showBrush && selectMode == SelectNone && (!zoomEnabled || zoomCursorFixed) && activeBrush && (isMouseDown || (currentMouse.X >= 0 && currentMouse.X < XRES && currentMouse.Y >= 0 && currentMouse.Y < YRES)))
{ {
ui::Point finalCurrentMouse = windTool ? c->PointTranslateNoClamp(currentMouse) : c->PointTranslate(currentMouse); ui::Point finalCurrentMouse = windTool ? c->PointTranslateNoClamp(currentMouse) : c->PointTranslate(currentMouse);
@@ -2170,7 +2175,7 @@ void GameView::OnDraw()
else else
initialDrawPoint.Y += CELL-1; initialDrawPoint.Y += CELL-1;
} }
activeBrush->RenderRect(ren, c->PointTranslate(initialDrawPoint), finalCurrentMouse); activeBrush->RenderRect(g, c->PointTranslate(initialDrawPoint), finalCurrentMouse);
} }
else if (drawMode == DrawLine && isMouseDown) else if (drawMode == DrawLine && isMouseDown)
{ {
@@ -2178,12 +2183,12 @@ void GameView::OnDraw()
{ {
finalCurrentMouse = lineSnapCoords(c->PointTranslate(initialDrawPoint), finalCurrentMouse); finalCurrentMouse = lineSnapCoords(c->PointTranslate(initialDrawPoint), finalCurrentMouse);
} }
activeBrush->RenderLine(ren, c->PointTranslate(initialDrawPoint), finalCurrentMouse); activeBrush->RenderLine(g, c->PointTranslate(initialDrawPoint), finalCurrentMouse);
} }
else if (drawMode == DrawFill)// || altBehaviour) else if (drawMode == DrawFill)// || altBehaviour)
{ {
if (!decoBrush) if (!decoBrush)
activeBrush->RenderFill(ren, finalCurrentMouse); activeBrush->RenderFill(g, finalCurrentMouse);
} }
if (drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown)) if (drawMode == DrawPoints || drawMode==DrawLine || (drawMode == DrawRect && !isMouseDown))
{ {
@@ -2192,14 +2197,14 @@ void GameView::OnDraw()
ui::Point finalBrushRadius = c->NormaliseBlockCoord(activeBrush->GetRadius()); ui::Point finalBrushRadius = c->NormaliseBlockCoord(activeBrush->GetRadius());
auto topLeft = finalCurrentMouse - finalBrushRadius; auto topLeft = finalCurrentMouse - finalBrushRadius;
auto bottomRight = finalCurrentMouse + finalBrushRadius + Vec2{ CELL - 1, CELL - 1 }; auto bottomRight = finalCurrentMouse + finalBrushRadius + Vec2{ CELL - 1, CELL - 1 };
ren->XorLine({ topLeft.X, topLeft.Y }, { bottomRight.X, topLeft.Y }); g->XorLine({ topLeft.X, topLeft.Y }, { bottomRight.X, topLeft.Y });
ren->XorLine({ topLeft.X, bottomRight.Y }, { bottomRight.X, bottomRight.Y }); g->XorLine({ topLeft.X, bottomRight.Y }, { bottomRight.X, bottomRight.Y });
ren->XorLine({ topLeft.X, topLeft.Y + 1 }, { topLeft.X, bottomRight.Y - 1 }); // offset by 1 so the corners don't get xor'd twice g->XorLine({ topLeft.X, topLeft.Y + 1 }, { topLeft.X, bottomRight.Y - 1 }); // offset by 1 so the corners don't get xor'd twice
ren->XorLine({ bottomRight.X, topLeft.Y + 1 }, { bottomRight.X, bottomRight.Y - 1 }); // offset by 1 so the corners don't get xor'd twice g->XorLine({ bottomRight.X, topLeft.Y + 1 }, { bottomRight.X, bottomRight.Y - 1 }); // offset by 1 so the corners don't get xor'd twice
} }
else else
{ {
activeBrush->RenderPoint(ren, finalCurrentMouse); activeBrush->RenderPoint(g, finalCurrentMouse);
} }
} }
} }
@@ -2211,15 +2216,15 @@ void GameView::OnDraw()
if(placeSaveThumb && selectPoint2.X!=-1) if(placeSaveThumb && selectPoint2.X!=-1)
{ {
auto rect = RectSized(PlaceSavePos() * CELL, placeSaveThumb->Size()); auto rect = RectSized(PlaceSavePos() * CELL, placeSaveThumb->Size());
ren->BlendImage(placeSaveThumb->Data(), 0x80, rect); g->BlendImage(placeSaveThumb->Data(), 0x80, rect);
ren->XorDottedRect(rect); g->XorDottedRect(rect);
} }
} }
else else
{ {
if(selectPoint1.X==-1) if(selectPoint1.X==-1)
{ {
ren->BlendFilledRect(RectSized(Vec2{ 0, 0 }, Vec2{ XRES, YRES }), 0x000000_rgb .WithAlpha(100)); g->BlendFilledRect(RectSized(Vec2{ 0, 0 }, Vec2{ XRES, YRES }), 0x000000_rgb .WithAlpha(100));
} }
else else
{ {
@@ -2233,20 +2238,17 @@ void GameView::OnDraw()
if(y2>YRES-1) if(y2>YRES-1)
y2 = YRES-1; y2 = YRES-1;
ren->BlendFilledRect(RectSized(Vec2{ 0, 0 }, Vec2{ XRES, y1 }), 0x000000_rgb .WithAlpha(100)); g->BlendFilledRect(RectSized(Vec2{ 0, 0 }, Vec2{ XRES, y1 }), 0x000000_rgb .WithAlpha(100));
ren->BlendFilledRect(RectSized(Vec2{ 0, y2+1 }, Vec2{ XRES, YRES-y2-1 }), 0x000000_rgb .WithAlpha(100)); g->BlendFilledRect(RectSized(Vec2{ 0, y2+1 }, Vec2{ XRES, YRES-y2-1 }), 0x000000_rgb .WithAlpha(100));
ren->BlendFilledRect(RectSized(Vec2{ 0, y1 }, Vec2{ x1, (y2-y1)+1 }), 0x000000_rgb .WithAlpha(100)); g->BlendFilledRect(RectSized(Vec2{ 0, y1 }, Vec2{ x1, (y2-y1)+1 }), 0x000000_rgb .WithAlpha(100));
ren->BlendFilledRect(RectSized(Vec2{ x2+1, y1 }, Vec2{ XRES-x2-1, (y2-y1)+1 }), 0x000000_rgb .WithAlpha(100)); g->BlendFilledRect(RectSized(Vec2{ x2+1, y1 }, Vec2{ XRES-x2-1, (y2-y1)+1 }), 0x000000_rgb .WithAlpha(100));
ren->XorDottedRect(RectBetween(Vec2{ x1, y1 }, Vec2{ x2, y2 })); g->XorDottedRect(RectBetween(Vec2{ x1, y1 }, Vec2{ x2, y2 }));
} }
} }
} }
c->AfterSimDraw();
std::copy_n(ren->Data(), ren->Size().X * ren->Size().Y, g->Data());
g->RenderZoom(); g->RenderZoom();
if (doScreenshot) if (doScreenshot)