Skip to content

feature(WorldBuilder): add all operation modes to single brush tool #1910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DimitrisKalyvas wants to merge 8 commits into
base: main
Choose a base branch
from
Open

feature(WorldBuilder): add all operation modes to single brush tool #1910

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b70665c
feature(WorldBuilder): add all operation modes to single brush tool
DimitrisKalyvas Nov 25, 2025
02ac220
feature(worldbuilder): add ability to change feather and brush size w…
DimitrisKalyvas Nov 25, 2025
a6110ad
feature(worldbuilder): Add on-screen context hint for brush use
DimitrisKalyvas Nov 25, 2025
14299cc
fix(worldbuilder): adress review comments
DimitrisKalyvas Nov 26, 2025
f5cae0f
fix/refactor(worldbuilder): address newer review comments
DimitrisKalyvas Nov 29, 2025
dc80a61
refactor(worldbuilder): refactored brush and wbview files
DimitrisKalyvas Dec 1, 2025
f57f9bd
refactor(worldbuilder): refactor HintDrawState for future expansion
DimitrisKalyvas Dec 2, 2025
2118634
fix/refactor(worldbuilder): optimisations
DimitrisKalyvas Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,40 @@ class WorldHeightMapEdit;
/// Height brush tool.
class BrushTool : public Tool
{
public:
enum {
MIN_RAISE_LOWER = 1,
MAX_RAISE_LOWER = 21,
MIN_SMOOTH_RADIUS = 1,
MAX_SMOOTH_RADIUS = 5,
MIN_SMOOTH_RATE = 1,
MAX_SMOOTH_RATE = 10
};

enum EBrushMode {
BRUSH_MODE_RAISE,
BRUSH_MODE_LOWER,
BRUSH_MODE_SET,
BRUSH_MODE_SMOOTH
};

protected:
enum {MIN_DELAY_TIME = 60};
Copy link

@Skyaero42 Skyaero42 Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this name is too generic. I would suggest to add what the delay time is for in the name.


WorldHeightMapEdit *m_htMapEditCopy; ///< ref counted.
WorldHeightMapEdit *m_htMapFeatherCopy; ///< ref counted.
WorldHeightMapEdit *m_htMapRateCopy; ///< ref counted (smooth mode).

static Int m_brushWidth;
static Int m_brushFeather;
static Bool m_brushSquare;
static Int m_brushHeight;
static Int m_raiseLowerAmount;
static Int m_smoothRadius;
static Int m_smoothRate;

EBrushMode m_activeMode;
Int m_lastMoveTime;

public:
BrushTool(void);
Expand All @@ -48,9 +74,19 @@ class BrushTool : public Tool
static Int getWidth(void) {return m_brushWidth;}; ///<Returns width.
static Int getFeather(void) {return m_brushFeather;}; ///<Returns feather.
static Int getHeight(void) {return m_brushHeight;}; ///<Returns height.
static Int getRaiseLowerAmount(void) {return m_raiseLowerAmount;};
static Int getSmoothRadius(void) {return m_smoothRadius;};
static Int getSmoothRate(void) {return m_smoothRate;};
static void setWidth(Int width);
static void setFeather(Int feather);
static void setHeight(Int height);
static void setRaiseLowerAmount(Int amount);
static void setSmoothRadius(Int radius);
static void setSmoothRate(Int rate);
static EBrushMode getModeFromModifiers(Bool shiftDown, Bool ctrlDown);
static EBrushMode getPreviewModeFromKeys();
static const char* getModeDisplayName(EBrushMode mode);
static void getModeHintStrings(char *primaryBuf, Int primaryBufSize, char *secondaryBuf, Int secondaryBufSize);

public:
virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc);
Expand All @@ -60,4 +96,10 @@ class BrushTool : public Tool
virtual void activate(); ///< Become the current tool.
virtual Bool followsTerrain(void) {return false;};

protected:
Copy link

@Skyaero42 Skyaero42 Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these can be made private

EBrushMode determineBrushMode() const;
void applySetHeightBrush(const CPoint &ndx, Int brushWidth, CWorldBuilderDoc *pDoc);
void applyRaiseLowerBrush(const CPoint &ndx, Int brushWidth, Bool raising, CWorldBuilderDoc *pDoc);
void applySmoothBrush(const CPoint &ndx, Int brushWidth, CWorldBuilderDoc *pDoc);
void resetSmoothRateBuffer();
};
20 changes: 19 additions & 1 deletion GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ class BrushOptions : public COptionsPanel , public PopupSliderOwner
FREQ_BRUSH_TICKS=10,
MIN_FEATHER=0,
FREQ_FEATHER_TICKS=4,
MAX_FEATHER=20};
MAX_FEATHER=20,
MIN_RAISE_LOWER=1,
MAX_RAISE_LOWER=21,
MIN_SMOOTH_RADIUS=1,
MAX_SMOOTH_RADIUS=5,
MIN_SMOOTH_RATE=1,
MAX_SMOOTH_RATE=10};

BrushOptions(CWnd* pParent = NULL); // standard constructor

Expand Down Expand Up @@ -64,6 +70,9 @@ class BrushOptions : public COptionsPanel , public PopupSliderOwner
afx_msg void OnChangeFeatherEdit();
afx_msg void OnChangeSizeEdit();
afx_msg void OnChangeHeightEdit();
afx_msg void OnChangeRaiseLowerEdit();
afx_msg void OnChangeSmoothRadiusEdit();
afx_msg void OnChangeSmoothRateEdit();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()

Expand All @@ -72,16 +81,25 @@ class BrushOptions : public COptionsPanel , public PopupSliderOwner
static Int m_currentWidth; ///< current brush width in the ui.
static Int m_currentFeather; ///< current feather width in the ui.
static Int m_currentHeight;
static Int m_currentRaiseLower;
static Int m_currentSmoothRadius;
static Int m_currentSmoothRate;

Bool m_updating; ///<true if the ui is updating itself.
WBPopupSliderButton m_brushWidthPopup;
WBPopupSliderButton m_brushFeatherPopup;
WBPopupSliderButton m_brushHeightPopup;
WBPopupSliderButton m_raiseLowerPopup;
WBPopupSliderButton m_smoothRadiusPopup;
WBPopupSliderButton m_smoothRatePopup;

public:
static void setWidth(Int width);
static void setFeather(Int feather);
static void setHeight(Int height);
static void setRaiseLowerAmount(Int amount);
static void setSmoothRadius(Int radius);
static void setSmoothRate(Int rate);

public:

Expand Down
3 changes: 3 additions & 0 deletions GeneralsMD/Code/Tools/WorldBuilder/res/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@
#define IDC_PSEd_Color1 1031
#define IDC_FEATHER_LABEL 1032
#define IDC_WIDTH_LABEL3 1032
#define IDC_RAISELOWER_EDIT 1800
Copy link

@Skyaero42 Skyaero42 Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Place them in order of number.

Also, why 1800? something like 2000 + comment would be more clear that this is custom superhackers stuff

#define IDC_RAISELOWER_POPUP 1801
#define IDC_RAISELOWER_LABEL 1802
#define IDC_TERRAIN_TREEVIEW 1033
#define IDC_SLIDER3 1034
#define IDC_SWAP_TEXTURES 1035
Expand Down
Loading