adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

add the storage mod for all variables

Browse Source
This commit is contained in:
vld_voiculescu
2026-08-09 14:59:53 +03:00
parent 1c14e4c12a
commit 801018f6d3
1 changed files with 102 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/terrain_generator/terrain_generator.cpp
+102 -53
View File
@@ -106,7 +106,6 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
s.valid = ( s.x1 - s.x0 >= min_size && s.y1 - s.y0 >= min_size );
return s;
};
const SelBounds init_sel = query_sel();
// --- Build dialog ---
QDialog dialog( main_window, Qt::Dialog | Qt::WindowCloseButtonHint );
@@ -116,11 +115,14 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
dialog.setMinimumWidth( 420 );
auto *form = new QFormLayout( &dialog );
// Target mode
// Target mode. Remembered across dialog open/close, same as everything
// else below — regardless of whether there's currently a valid
// selection, so it's predictable rather than silently overridden.
static int s_target_index = 0; // Use Selection
auto *target_combo = new ComboBox;
target_combo->addItem( "Use Selection", 0 );
target_combo->addItem( "Manual Size", 1 );
target_combo->setCurrentIndex( init_sel.valid ? 0 : 1 );
target_combo->setCurrentIndex( s_target_index );
form->addRow( "Target:", target_combo );
// Selection size — live, read-only labels showing the current selection.
@@ -153,43 +155,43 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
form->addRow( "Length (Y):", manual_l_spin );
form->addRow( "Height (Z):", manual_h_spin );
// Reset the remembered manual size back to the original hardcoded default.
auto *manual_reset_btn = new QPushButton( "Reset to Default" );
QObject::connect( manual_reset_btn, &QPushButton::clicked, [&](){
manual_w_spin->setValue( DEFAULT_MANUAL_W );
manual_l_spin->setValue( DEFAULT_MANUAL_L );
manual_h_spin->setValue( DEFAULT_MANUAL_H );
} );
form->addRow( "", manual_reset_btn );
// Sub-square size: preset combo + Advanced checkbox in one row
// Sub-square size: preset combo + Advanced checkbox in one row.
// This and most settings below are remembered across dialog open/close,
// same as Manual Size, since none are specific to one target mode.
static int s_sq_index = 3; // 64
static bool s_advanced = false;
auto *sq_widget = new QWidget;
auto *sq_hbox = new QHBoxLayout( sq_widget );
sq_hbox->setContentsMargins( 0, 0, 0, 0 );
auto *sq_combo = new ComboBox;
for ( int v : { 8, 16, 32, 64, 128, 256, 512, 1024 } )
sq_combo->addItem( QString::number( v ), v );
sq_combo->setCurrentIndex( 3 ); // 64
sq_combo->setCurrentIndex( s_sq_index );
auto *sq_advanced = new QCheckBox( "Advanced" );
sq_advanced->setChecked( s_advanced );
sq_hbox->addWidget( sq_combo );
sq_hbox->addWidget( sq_advanced );
form->addRow( "Sub-square Size:", sq_widget );
// Advanced step X/Y (hidden until Advanced is checked)
auto *step_x_spin = new SpinBox( 8, 512, 64, 0, 8 );
auto *step_y_spin = new SpinBox( 8, 512, 64, 0, 8 );
static int s_step_x = 64, s_step_y = 64;
auto *step_x_spin = new SpinBox( 8, 512, s_step_x, 0, 8 );
auto *step_y_spin = new SpinBox( 8, 512, s_step_y, 0, 8 );
form->addRow( "Step X:", step_x_spin );
form->addRow( "Step Y:", step_y_spin );
// Jitters each vertex's X/Y position (standard terrain only) so
// triangles vary in size instead of tiling identical rectangles.
static bool s_jitter = false;
auto *jitter_check = new QCheckBox( "Irregular Grid" );
jitter_check->setChecked( s_jitter );
jitter_check->setToolTip( "Varies triangle sizes instead of a uniform grid.\n"
"Occasionally produces an oddly steep or spiky triangle —\n"
"if that happens, just regenerate." );
form->addRow( "", jitter_check );
// Base shape
static int s_shape_index = 0; // Flat
auto *shape_combo = new ComboBox;
shape_combo->addItem( "Flat (None)", (int)ShapeType::Flat );
shape_combo->addItem( "Hill", (int)ShapeType::Hill );
@@ -200,57 +202,73 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
shape_combo->addItem( "Valley", (int)ShapeType::Valley );
shape_combo->addItem( "Tunnel", (int)ShapeType::Tunnel );
shape_combo->addItem( "Slope Tunnel", (int)ShapeType::SlopeTunnel );
shape_combo->setCurrentIndex( 0 ); // Flat
shape_combo->setCurrentIndex( s_shape_index );
form->addRow( "Base Shape:", shape_combo );
// Direction for Slope/Ridge/Valley and tunnels; ignored by radially
// symmetric shapes. Default differs per shape (see update_shape below).
// symmetric shapes.
static int s_axis_index = (int)Axis::X;
auto *axis_combo = new ComboBox;
axis_combo->addItem( "X Axis", (int)Axis::X );
axis_combo->addItem( "Y Axis", (int)Axis::Y );
axis_combo->setCurrentIndex( 0 );
axis_combo->setCurrentIndex( s_axis_index );
form->addRow( "Axis:", axis_combo );
// Shape height — editable spinbox (manual mode or non-slope shapes).
// For Slope / Slope Tunnel in Use Selection mode, replaced by a
// read-only label derived from the selection brush's Z extent.
auto *shape_height_spin = new DoubleSpinBox( 0, 4096, 256, 2, 8 );
// Shape height (relabeled per shape below). Auto-derived from the
// selection for Slope/Slope Tunnel in Use Selection mode (see
// slope_derived below) — the remembered value only shows otherwise.
static double s_shape_height = 256.0;
auto *shape_height_spin = new DoubleSpinBox( 0, 4096, s_shape_height, 2, 8 );
form->addRow( "Peak Height:", shape_height_spin );
// Tunnel height — only visible for Slope Tunnel
auto *tunnel_height_spin = new DoubleSpinBox( 0, 4096, 256, 2, 8 );
static double s_tunnel_height = 256.0;
auto *tunnel_height_spin = new DoubleSpinBox( 0, 4096, s_tunnel_height, 2, 8 );
form->addRow( "Tunnel Height:", tunnel_height_spin );
// Terrace step — hidden for Flat
auto *terrace_spin = new DoubleSpinBox( 0, 512, 0, 2, 8 );
static double s_terrace = 0.0;
auto *terrace_spin = new DoubleSpinBox( 0, 512, s_terrace, 2, 8 );
form->addRow( "Terrace Step:", terrace_spin );
// Every generated vertex height snaps to a multiple of this, so it lands
// cleanly on the editor's grid for manual editing later.
static int s_grid_step_index = 0; // 1
auto *grid_step_combo = new ComboBox;
for ( int v : { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024 } )
grid_step_combo->addItem( QString::number( v ), v );
grid_step_combo->setCurrentIndex( 0 ); // 1
grid_step_combo->setCurrentIndex( s_grid_step_index );
form->addRow( "Grid Step:", grid_step_combo );
// Noise type
static int s_noise_index = 0; // Perlin
auto *noise_combo = new ComboBox;
noise_combo->addItem( "Perlin Noise", (int)NoiseType::Perlin );
noise_combo->addItem( "Simplex Noise", (int)NoiseType::Simplex );
noise_combo->addItem( "Regular (Random)", (int)NoiseType::Random );
noise_combo->setCurrentIndex( s_noise_index );
form->addRow( "Noise Type:", noise_combo );
// Variance / Frequency
auto *variance_spin = new DoubleSpinBox( 0, 1024, 32, 2, 1 );
static double s_variance = 32.0, s_frequency = 0.005;
auto *variance_spin = new DoubleSpinBox( 0, 1024, s_variance, 2, 1 );
form->addRow( "Variance:", variance_spin );
auto *frequency_spin = new DoubleSpinBox( 0.0001, 1.0, 0.005, 4, 0.001 );
auto *frequency_spin = new DoubleSpinBox( 0.0001, 1.0, s_frequency, 4, 0.001 );
form->addRow( "Frequency:", frequency_spin );
// Texture — line edit + Pick button to grab from texture browser
// Texture — line edit + Pick button to grab from texture browser.
// Prefers the live browser selection, then the remembered texture,
// then this hardcoded default.
const QString DEFAULT_TEXTURE = "textures/";
static std::string s_texture;
auto *tex_widget = new QWidget;
auto *tex_hbox = new QHBoxLayout( tex_widget );
tex_hbox->setContentsMargins( 0, 0, 0, 0 );
auto *texture_edit = new QLineEdit( GlobalRadiant().TextureBrowser_getSelectedShader() );
const QString browser_shader = GlobalRadiant().TextureBrowser_getSelectedShader();
const QString initial_texture = !browser_shader.isEmpty() ? browser_shader
: !s_texture.empty() ? QString::fromStdString( s_texture )
: DEFAULT_TEXTURE;
auto *texture_edit = new QLineEdit( initial_texture );
auto *tex_pick = new QPushButton( "Pick" );
tex_pick->setFixedWidth( 48 );
tex_hbox->addWidget( texture_edit );
@@ -290,6 +308,31 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
} );
form->addRow( "Texture:", tex_widget );
// Resets every remembered setting to its original default. Always
// visible (not mode-gated). Target mode is deliberately left alone.
auto *reset_btn = new QPushButton( "Reset to Default" );
QObject::connect( reset_btn, &QPushButton::clicked, [&](){
manual_w_spin->setValue( DEFAULT_MANUAL_W );
manual_l_spin->setValue( DEFAULT_MANUAL_L );
manual_h_spin->setValue( DEFAULT_MANUAL_H );
sq_combo->setCurrentIndex( 3 ); // 64
sq_advanced->setChecked( false );
step_x_spin->setValue( 64 );
step_y_spin->setValue( 64 );
jitter_check->setChecked( false );
shape_combo->setCurrentIndex( 0 ); // Flat
axis_combo->setCurrentIndex( (int)Axis::X );
shape_height_spin->setValue( 256.0 );
tunnel_height_spin->setValue( 256.0 );
terrace_spin->setValue( 0.0 );
grid_step_combo->setCurrentIndex( 0 ); // 1
noise_combo->setCurrentIndex( 0 ); // Perlin
variance_spin->setValue( 32.0 );
frequency_spin->setValue( 0.005 );
texture_edit->setText( DEFAULT_TEXTURE );
} );
form->addRow( "", reset_btn );
// Explicit layout (Generate left, Close right) so order is platform-independent.
auto *btn_widget = new QWidget;
auto *btn_layout = new QHBoxLayout( btn_widget );
@@ -570,6 +613,11 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
&& ( st == ShapeType::Slope || st == ShapeType::SlopeTunnel );
};
// Suppressed only for the initial post-restore call below, so a
// restored height survives dialog open. Only wired into
// update_target_mode — switching shapes never touches this value.
bool auto_derive_slope_height = true;
// Target mode toggle: read-only selection labels vs editable spinboxes.
// Refresh labels each time the user switches to "Use Selection" so they
// reflect whatever is selected at that moment.
@@ -577,7 +625,7 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
const bool use_sel = ( idx == 0 );
if ( use_sel ) {
refresh_sel_labels();
if ( slope_derived() ) {
if ( slope_derived() && auto_derive_slope_height ) {
// Prefer the stored footprint height over the live (grown)
// selection, which would over-steepen the slope.
double sw, sl, sh;
@@ -597,7 +645,6 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
set_row_visible( manual_w_spin, !use_sel );
set_row_visible( manual_l_spin, !use_sel );
set_row_visible( manual_h_spin, !use_sel );
set_row_visible( manual_reset_btn, !use_sel );
};
// Advanced sub-square toggle
@@ -607,7 +654,8 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
set_row_visible( step_y_spin, advanced );
};
// Shape type toggle: labels + visibility
// Shape type toggle: labels + visibility only — Axis and shape height
// are fully sticky, never reset by a shape switch.
auto update_shape = [&]( int idx ){
const ShapeType st = (ShapeType)shape_combo->itemData( idx ).toInt();
const bool is_flat = ( st == ShapeType::Flat );
@@ -617,28 +665,10 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
|| is_tunnel_shape );
set_row_visible( axis_combo, has_axis );
if ( has_axis ) {
// Matches each shape's original hardcoded axis (Slope/Ridge/Valley: X, tunnels: Y).
axis_combo->setCurrentIndex( is_tunnel_shape ? (int)Axis::Y : (int)Axis::X );
}
set_row_visible( shape_height_spin, !is_flat );
if ( !is_flat ) {
if ( auto *lbl = qobject_cast<QLabel*>( form->labelForField( shape_height_spin ) ) )
lbl->setText( shape_height_label[idx] );
// Auto-fill slope height from selection when applicable
if ( slope_derived() ) {
// Prefer the stored footprint height over the live (grown)
// selection, which would over-steepen the slope.
double sw, sl, sh;
if ( read_stored_size( sw, sl, sh ) ) {
shape_height_spin->setValue( sh );
}
else {
const SelBounds s = query_sel();
if ( s.valid )
shape_height_spin->setValue( s.z1 - s.z0 );
}
}
}
set_row_visible( tunnel_height_spin, is_slope_tunnel );
// Terrace not applicable to flat tunnels (no slope to step),
@@ -654,10 +684,13 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
QObject::connect( sq_advanced, &QCheckBox::toggled, update_advanced );
QObject::connect( shape_combo, QOverload<int>::of( &QComboBox::currentIndexChanged ), update_shape );
// Set initial visibility
// Set initial visibility. Slope-height auto-derive is suppressed across
// this call so the just-restored height survives dialog open.
auto_derive_slope_height = false;
update_target_mode( target_combo->currentIndex() );
update_advanced( false );
update_advanced( sq_advanced->isChecked() );
update_shape( shape_combo->currentIndex() );
auto_derive_slope_height = true;
// show() instead of exec() so the dialog is non-modal — the texture
// browser panel (and all other Radiant windows) remain interactive
@@ -668,9 +701,25 @@ void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush
QObject::connect( &dialog, &QDialog::finished, &loop, &QEventLoop::quit );
loop.exec();
}
s_target_index = target_combo->currentIndex();
s_manual_w = manual_w_spin->value();
s_manual_l = manual_l_spin->value();
s_manual_h = manual_h_spin->value();
s_sq_index = sq_combo->currentIndex();
s_advanced = sq_advanced->isChecked();
s_step_x = step_x_spin->value();
s_step_y = step_y_spin->value();
s_jitter = jitter_check->isChecked();
s_shape_index = shape_combo->currentIndex();
s_axis_index = axis_combo->currentIndex();
s_shape_height = shape_height_spin->value();
s_tunnel_height = tunnel_height_spin->value();
s_terrace = terrace_spin->value();
s_grid_step_index = grid_step_combo->currentIndex();
s_noise_index = noise_combo->currentIndex();
s_variance = variance_spin->value();
s_frequency = frequency_spin->value();
s_texture = texture_edit->text().toStdString();
s_active_dialog = nullptr;
}
}