quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UV Tool (edit texture alignment of selected face) modifiers:

Browse Source 
pivot control point and lines: ctrl = snap hard to face vertices and grid
		grid density controls: shift = change density of both axes synchronously, ctrl = power of two grid
		scale lines: shift = scale axes synchronously, ctrl = snap hard to vertices
		alt + m1 on grid = skew texture (is possible alright in BP and Valve220 map formats, not in AP); ctrl = snap hard to edges
		texture move: shift = only move along the axis with the biggest move, ctrl = snap grid lines hard to vertices and pivot
		rotate: shift = rotate with step of 15 degrees, ctrl = snap hard to edges
This commit is contained in:
Garux
2019-05-19 10:30:44 +03:00
parent 3ce07bb310
commit aa99f4d254
11 changed files with 1487 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
radiant/mainframe.cpp
View File

@@ -1441,6 +1441,10 @@ void BuildToolExport( const BoolImportCallback& importCallback ){
importCallback( GlobalSelectionSystem().ManipulatorMode() == SelectionSystem::eBuild );
}
void UVToolExport( const BoolImportCallback& importCallback ){
importCallback( GlobalSelectionSystem().ManipulatorMode() == SelectionSystem::eUV );
}
FreeCaller1<const BoolImportCallback&, TranslateToolExport> g_translatemode_button_caller;
BoolExportCallback g_translatemode_button_callback( g_translatemode_button_caller );
ToggleItem g_translatemode_button( g_translatemode_button_callback );
@@ -1469,6 +1473,10 @@ FreeCaller1<const BoolImportCallback&, BuildToolExport> g_build_button_caller;
BoolExportCallback g_build_button_callback( g_build_button_caller );
ToggleItem g_build_button( g_build_button_callback );
FreeCaller1<const BoolImportCallback&, UVToolExport> g_uv_button_caller;
BoolExportCallback g_uv_button_callback( g_uv_button_caller );
ToggleItem g_uv_button( g_uv_button_callback );
void ToolChanged(){
g_translatemode_button.update();
g_rotatemode_button.update();
@@ -1477,6 +1485,7 @@ void ToolChanged(){
g_dragmode_button.update();
g_clipper_button.update();
g_build_button.update();
g_uv_button.update();
}
const char* const c_ResizeMode_status = "QE4 Drag Tool: move and resize objects";
@@ -1615,6 +1624,28 @@ void BuildMode(){
}
const char* const c_UVMode_status = "UV Tool: edit texture alignment";
void UVMode(){
if ( g_currentToolMode == UVMode && g_defaultToolMode != UVMode ) {
g_defaultToolMode();
}
else
{
g_currentToolMode = UVMode;
g_currentToolModeSupportsComponentEditing = false;
SelectionSystem_DefaultMode();
ComponentModeChanged();
Sys_Status( c_UVMode_status );
GlobalSelectionSystem().SetManipulatorMode( SelectionSystem::eUV );
ToolChanged();
ModeChangeNotify();
}
}
void ToggleRotateScaleModes(){
return g_currentToolMode == RotateMode? ScaleMode() : RotateMode();
}
@@ -2404,6 +2435,7 @@ void Manipulators_registerShortcuts(){
toggle_add_accelerator( "MouseDrag" );
toggle_add_accelerator( "ToggleClipper" );
toggle_add_accelerator( "MouseBuild" );
toggle_add_accelerator( "MouseUV" );
command_connect_accelerator( "MouseRotateOrScale" );
command_connect_accelerator( "MouseDragOrTransform" );
@@ -2535,6 +2567,7 @@ void Manipulators_constructToolbar( GtkToolbar* toolbar ){
toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.png", "MouseDrag" );
toolbar_append_toggle_button( toolbar, "Clipper (X)", "select_clipper.png", "ToggleClipper" );
// toolbar_append_toggle_button( toolbar, "Build (B)", "select_mouserotate.png", "MouseBuild" );
toolbar_append_toggle_button( toolbar, "UV Tool (G)", "select_mouseuv.png", "MouseUV" );
}
GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
@@ -3604,6 +3637,7 @@ void MainFrame_Construct(){
GlobalToggles_insert( "MouseTransform", FreeCaller<SkewMode>(), ToggleItem::AddCallbackCaller( g_skewmode_button ) );
GlobalToggles_insert( "MouseDrag", FreeCaller<DragMode>(), ToggleItem::AddCallbackCaller( g_dragmode_button ) );
GlobalToggles_insert( "MouseBuild", FreeCaller<BuildMode>(), ToggleItem::AddCallbackCaller( g_build_button ), Accelerator( 'B' ) );
GlobalToggles_insert( "MouseUV", FreeCaller<UVMode>(), ToggleItem::AddCallbackCaller( g_uv_button ), Accelerator( Accelerator( 'G' ) ) );
GlobalCommands_insert( "MouseRotateOrScale", FreeCaller<ToggleRotateScaleModes>() );
GlobalCommands_insert( "MouseDragOrTransform", FreeCaller<ToggleDragSkewModes>(), Accelerator( 'Q' ) );