archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- Removed temporal hack that switched manipulator type on G, R, S hotkeys.

Browse Source 
That was blocking immediate hotkey access for normal blendering.
- New, experimental, hotkey to switch: CTRLKEY! Added code in such a way
  it detects a CTRL key press and release without using it as modifier.
  Pressing CTRL will cycle through the 3 manipulator types.

- Fix for yesterday's commit; click on centerpoint for switching
  orientation happened too on a click for other widgets. Not nice...
This commit is contained in:
Ton Roosendaal
2005-03-22 15:01:36 +00:00
parent 1f203ac7f1
commit 1a4138e184
3 changed files with 53 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
source/blender/src/space.c
View File

@@ -713,6 +713,7 @@ void BIF_undo_menu(void)
static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt) static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
{ {
static short prev_event= 0; // used to detect an alt/ctrl/shift event
unsigned short event= evt->event; unsigned short event= evt->event;
short val= evt->val; short val= evt->val;
char ascii= evt->ascii; char ascii= evt->ascii;
@@ -725,6 +726,8 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
if(val) { if(val) {
prev_event= event; // for ctrl/alt/shift event
if( uiDoBlocks(&curarea->uiblocks, event)!=UI_NOTHING ) event= 0; if( uiDoBlocks(&curarea->uiblocks, event)!=UI_NOTHING ) event= 0;
if(event==MOUSEY || event==MOUSEX) return; if(event==MOUSEY || event==MOUSEX) return;
@@ -1217,13 +1220,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
clear_object('g'); clear_object('g');
} }
} else if((G.qual==0)) { } else if((G.qual==0)) {
if(v3d->twflag & V3D_USE_MANIPULATOR) {
if((v3d->twtype & V3D_MANIPULATOR_TRANSLATE)==0) {
v3d->twtype= V3D_MANIPULATOR_TRANSLATE;
doredraw= 1;
break;
}
}
#ifdef NEWTRANSFORM #ifdef NEWTRANSFORM
Transform(TFM_TRANSLATION); Transform(TFM_TRANSLATION);
#else #else
@@ -1490,13 +1486,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
loopoperations(LOOP_CUT); loopoperations(LOOP_CUT);
} }
else if((G.qual==0)) { else if((G.qual==0)) {
if(v3d->twflag & V3D_USE_MANIPULATOR) {
if((v3d->twtype & V3D_MANIPULATOR_ROTATE)==0) {
v3d->twtype= V3D_MANIPULATOR_ROTATE;
doredraw= 1;
break;
}
}
#ifdef NEWTRANSFORM #ifdef NEWTRANSFORM
Transform(TFM_ROTATION); Transform(TFM_ROTATION);
#else #else
@@ -1505,13 +1494,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
} }
} }
else if((G.qual==0)) { else if((G.qual==0)) {
if(v3d->twflag & V3D_USE_MANIPULATOR) {
if((v3d->twtype & V3D_MANIPULATOR_ROTATE)==0) {
v3d->twtype= V3D_MANIPULATOR_ROTATE;
doredraw= 1;
break;
}
}
#ifdef NEWTRANSFORM #ifdef NEWTRANSFORM
Transform(TFM_ROTATION); Transform(TFM_ROTATION);
#else #else
@@ -1538,13 +1520,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
else if(G.qual==LR_SHIFTKEY) else if(G.qual==LR_SHIFTKEY)
snapmenu(); snapmenu();
else if(G.qual==0) { else if(G.qual==0) {
if(v3d->twflag & V3D_USE_MANIPULATOR) {
if((v3d->twtype & V3D_MANIPULATOR_SCALE)==0) {
v3d->twtype= V3D_MANIPULATOR_SCALE;
doredraw= 1;
break;
}
}
#ifdef NEWTRANSFORM #ifdef NEWTRANSFORM
Transform(TFM_RESIZE); Transform(TFM_RESIZE);
#else #else
@@ -1567,13 +1542,6 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
snapmenu(); snapmenu();
} }
else if((G.qual==0)) { else if((G.qual==0)) {
if(v3d->twflag & V3D_USE_MANIPULATOR) {
if((v3d->twtype & V3D_MANIPULATOR_SCALE)==0) {
v3d->twtype= V3D_MANIPULATOR_SCALE;
doredraw= 1;
break;
}
}
#ifdef NEWTRANSFORM #ifdef NEWTRANSFORM
Transform(TFM_RESIZE); Transform(TFM_RESIZE);
#else #else
@@ -1825,6 +1793,25 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
} }
} }
} }
else { // val==0, hotkeys for ctrl/alt/shift
if(prev_event==event) {
switch(event) {
case RIGHTCTRLKEY:
case LEFTCTRLKEY:
if(v3d->twflag & V3D_USE_MANIPULATOR) {
if(v3d->twtype & V3D_MANIPULATOR_TRANSLATE)
v3d->twtype= V3D_MANIPULATOR_ROTATE;
else if(v3d->twtype & V3D_MANIPULATOR_ROTATE)
v3d->twtype= V3D_MANIPULATOR_SCALE;
else if(v3d->twtype & V3D_MANIPULATOR_SCALE)
v3d->twtype= V3D_MANIPULATOR_TRANSLATE;
doredraw= 1;
}
break;
}
}
}
if(doredraw) { if(doredraw) {
scrarea_queue_winredraw(curarea); scrarea_queue_winredraw(curarea);

20
source/blender/src/transform.c
View File

@@ -1664,6 +1664,26 @@ void ManipulatorTransform(int mode)
ret_val = TRANS_CONFIRM; ret_val = TRANS_CONFIRM;
break; break;
} }
if(val) {
switch(event) {
case WHEELDOWNMOUSE:
case PADPLUSKEY:
if(G.f & G_PROPORTIONAL) {
Trans.propsize*= 1.1f;
calculatePropRatio(&Trans);
Trans.redraw= 1;
}
break;
case WHEELUPMOUSE:
case PADMINUS:
if(G.f & G_PROPORTIONAL) {
Trans.propsize*= 0.90909090f;
calculatePropRatio(&Trans);
Trans.redraw= 1;
}
break;
}
}
} }
} }

20
source/blender/src/transform_manipulator.c
View File

@@ -1384,15 +1384,17 @@ int BIF_do_manipulator(ScrArea *sa)
/* cycling orientation modus */ /* cycling orientation modus */
getmouseco_areawin(mval); getmouseco_areawin(mval);
if(mvalo[0]==mval[0] && mvalo[1]==mval[1]) { if(val==MAN_ROT_V || val==MAN_SCALE_C || val==MAN_TRANS_C) {
if(v3d->twmode==V3D_MANIPULATOR_GLOBAL) if(mvalo[0]==mval[0] && mvalo[1]==mval[1]) {
v3d->twmode= V3D_MANIPULATOR_LOCAL; if(v3d->twmode==V3D_MANIPULATOR_GLOBAL)
else if(v3d->twmode==V3D_MANIPULATOR_LOCAL) v3d->twmode= V3D_MANIPULATOR_LOCAL;
if(G.obedit || G.obpose) v3d->twmode= V3D_MANIPULATOR_NORMAL; else if(v3d->twmode==V3D_MANIPULATOR_LOCAL)
else v3d->twmode= V3D_MANIPULATOR_GLOBAL; if(G.obedit || G.obpose) v3d->twmode= V3D_MANIPULATOR_NORMAL;
else if(v3d->twmode==V3D_MANIPULATOR_NORMAL) else v3d->twmode= V3D_MANIPULATOR_GLOBAL;
v3d->twmode= V3D_MANIPULATOR_GLOBAL; else if(v3d->twmode==V3D_MANIPULATOR_NORMAL)
v3d->twmode= V3D_MANIPULATOR_GLOBAL;
}
} }
} }