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

ctrl+m2=clipper

Browse Source
This commit is contained in:
Garux 2017-08-02 09:02:12 +03:00
parent 4616fea08c
commit 09b97bb415
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
radiant/mainframe.h
View File

@ -232,6 +232,7 @@ void UpdateAllWindows();
void ClipperChangeNotify(); void ClipperChangeNotify();
void ClipperMode();
void DefaultMode(); void DefaultMode();

22
radiant/xywindow.cpp
View File

@ -110,6 +110,7 @@ void Draw( const char *label, float scale );
VIEWTYPE g_clip_viewtype; VIEWTYPE g_clip_viewtype;
bool g_bSwitch = true; bool g_bSwitch = true;
bool g_clip_useCaulk = false; bool g_clip_useCaulk = false;
bool g_quick_clipper = false;
ClipPoint g_Clip1; ClipPoint g_Clip1;
ClipPoint g_Clip2; ClipPoint g_Clip2;
ClipPoint g_Clip3; ClipPoint g_Clip3;
@ -258,6 +259,10 @@ void Clip(){
g_Clip3.Reset(); g_Clip3.Reset();
Clip_Update(); Clip_Update();
ClipperChangeNotify(); ClipperChangeNotify();
if( g_quick_clipper ){
g_quick_clipper = false;
ClipperMode();
}
} }
} }
@ -272,6 +277,10 @@ void SplitClip(){
g_Clip3.Reset(); g_Clip3.Reset();
Clip_Update(); Clip_Update();
ClipperChangeNotify(); ClipperChangeNotify();
if( g_quick_clipper ){
g_quick_clipper = false;
ClipperMode();
}
} }
} }
@ -923,6 +932,10 @@ unsigned int Clipper_buttons(){
return RAD_LBUTTON; return RAD_LBUTTON;
} }
unsigned int Clipper_quick_buttons(){
return RAD_RBUTTON | RAD_CONTROL;
}
void XYWnd::DropClipPoint( int pointx, int pointy ){ void XYWnd::DropClipPoint( int pointx, int pointy ){
Vector3 point; Vector3 point;
@ -1298,7 +1311,12 @@ void XYWnd::XY_MouseDown( int x, int y, unsigned int buttons ){
else if ( buttons == Zoom_buttons() ) { else if ( buttons == Zoom_buttons() ) {
Zoom_Begin(); Zoom_Begin();
} }
else if ( ClipMode() && buttons == Clipper_buttons() ) { else if ( ClipMode() && ( buttons == Clipper_buttons() || buttons == Clipper_quick_buttons() ) ) {
Clipper_OnLButtonDown( x, y );
}
else if ( !ClipMode() && buttons == Clipper_quick_buttons() ) {
ClipperMode();
g_quick_clipper = true;
Clipper_OnLButtonDown( x, y ); Clipper_OnLButtonDown( x, y );
} }
else if ( buttons == NewBrushDrag_buttons() && GlobalSelectionSystem().countSelected() == 0 ) { else if ( buttons == NewBrushDrag_buttons() && GlobalSelectionSystem().countSelected() == 0 ) {
@ -1326,7 +1344,7 @@ void XYWnd::XY_MouseUp( int x, int y, unsigned int buttons ){
else if ( m_zoom_started ) { else if ( m_zoom_started ) {
Zoom_End(); Zoom_End();
} }
else if ( ClipMode() && buttons == Clipper_buttons() ) { else if ( ClipMode() && ( buttons == Clipper_buttons() || buttons == Clipper_quick_buttons() ) ) {
Clipper_OnLButtonUp( x, y ); Clipper_OnLButtonUp( x, y );
} }
else if ( m_bNewBrushDrag ) { else if ( m_bNewBrushDrag ) {