griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2.5

Browse Source 
Brought back the basics for transform manipulators. Martin will
hook it all up to new transform system.

Some notes:
- Still uses G.moving
- BIF_do_manipulator() is called as a View3D Operator
  I've tested selecting handles, added a print to confirm
- BIF_GetTransInfo() returns a dummy struct now, just to get
  it running.
- Marked some other issues with XXX
This commit is contained in:
Ton Roosendaal
2009-07-08 15:01:28 +00:00
parent 031ed0431c
commit f3fd7d8800
15 changed files with 417 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/include/BIF_transform.h
View File

@@ -128,8 +128,8 @@ void BIF_selectOrientation(void);
void initManipulator(int mode);
void ManipulatorTransform();
//int BIF_do_manipulator(struct ScrArea *sa);
//void BIF_draw_manipulator(struct ScrArea *sa);
int BIF_do_manipulator(struct bContext *C, short mval[2]);
void BIF_draw_manipulator(const struct bContext *C);
/* Snapping */

52
source/blender/editors/space_view3d/drawobject.c
View File

@@ -565,58 +565,6 @@ static void view3d_object_text_draw(View3D *v3d, ARegion *ar)
BLI_freelistN(&strings);
}
void drawsolidcube(float size)
{
float n[3];
glPushMatrix();
glScalef(size, size, size);
n[0]=0; n[1]=0; n[2]=0;
glBegin(GL_QUADS);
n[0]= -1.0;
glNormal3fv(n);
glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
n[0]=0;
glEnd();
glBegin(GL_QUADS);
n[1]= -1.0;
glNormal3fv(n);
glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[1]);
n[1]=0;
glEnd();
glBegin(GL_QUADS);
n[0]= 1.0;
glNormal3fv(n);
glVertex3fv(cube[4]); glVertex3fv(cube[7]); glVertex3fv(cube[6]); glVertex3fv(cube[5]);
n[0]=0;
glEnd();
glBegin(GL_QUADS);
n[1]= 1.0;
glNormal3fv(n);
glVertex3fv(cube[7]); glVertex3fv(cube[3]); glVertex3fv(cube[2]); glVertex3fv(cube[6]);
n[1]=0;
glEnd();
glBegin(GL_QUADS);
n[2]= 1.0;
glNormal3fv(n);
glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
n[2]=0;
glEnd();
glBegin(GL_QUADS);
n[2]= -1.0;
glNormal3fv(n);
glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);
glEnd();
glPopMatrix();
}
static void drawcube(void)
{

3
source/blender/editors/space_view3d/view3d_draw.c
View File

@@ -70,6 +70,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "BIF_transform.h"
#include "WM_api.h"
#include "BLF_api.h"
@@ -2019,7 +2020,7 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
if(rv3d->rflag & RV3D_CLIPPING)
view3d_clr_clipping();
// BIF_draw_manipulator(ar);
BIF_draw_manipulator(C);
if(v3d->zbuf) {
v3d->zbuf= FALSE;

38
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -63,6 +63,7 @@
#include "BIF_gl.h"
#include "BIF_retopo.h"
#include "BIF_transform.h"
#include "WM_api.h"
#include "WM_types.h"
@@ -1858,6 +1859,43 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot)
}
/* ***************** manipulator op ******************* */
static int manipulator_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
View3D *v3d = CTX_wm_view3d(C);
if(!(v3d->twflag & V3D_USE_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
if(!(v3d->twflag & V3D_DRAW_MANIPULATOR)) return OPERATOR_PASS_THROUGH;
/* note; otherwise opengl won't work */
view3d_operator_needs_opengl(C);
if(0==BIF_do_manipulator(C, event->mval))
return OPERATOR_PASS_THROUGH;
return OPERATOR_FINISHED;
}
void VIEW3D_OT_manipulator(wmOperatorType *ot)
{
/* identifiers */
ot->name= "3D Manipulator";
ot->description = "";
ot->idname= "VIEW3D_OT_manipulator";
/* api callbacks */
ot->invoke= manipulator_invoke;
ot->poll= ED_operator_view3d_active;
/* rna later */
}
/* ************************* below the line! *********************** */

12
source/blender/editors/space_view3d/view3d_header.c
View File

@@ -4978,16 +4978,22 @@ static void do_view3d_header_buttons(bContext *C, void *arg, int event)
break;
case B_MAN_TRANS:
if( shift==0 || v3d->twtype==0)
if( shift==0 || v3d->twtype==0) {
v3d->twtype= V3D_MANIP_TRANSLATE;
ED_area_tag_redraw(sa);
}
break;
case B_MAN_ROT:
if( shift==0 || v3d->twtype==0)
if( shift==0 || v3d->twtype==0) {
v3d->twtype= V3D_MANIP_ROTATE;
ED_area_tag_redraw(sa);
}
break;
case B_MAN_SCALE:
if( shift==0 || v3d->twtype==0)
if( shift==0 || v3d->twtype==0) {
v3d->twtype= V3D_MANIP_SCALE;
ED_area_tag_redraw(sa);
}
break;
case B_NDOF:
break;

1
source/blender/editors/space_view3d/view3d_intern.h
View File

@@ -76,6 +76,7 @@ void VIEW3D_OT_view_persportho(struct wmOperatorType *ot);
void VIEW3D_OT_view_orbit(struct wmOperatorType *ot);
void VIEW3D_OT_clipping(struct wmOperatorType *ot);
void VIEW3D_OT_cursor3d(struct wmOperatorType *ot);
void VIEW3D_OT_manipulator(struct wmOperatorType *ot);
void VIEW3D_OT_render_border(struct wmOperatorType *ot);
void VIEW3D_OT_zoom_border(struct wmOperatorType *ot);
void VIEW3D_OT_drawtype(struct wmOperatorType *ot);

2
source/blender/editors/space_view3d/view3d_ops.c
View File

@@ -79,6 +79,7 @@ void view3d_operatortypes(void)
WM_operatortype_append(VIEW3D_OT_smoothview);
WM_operatortype_append(VIEW3D_OT_render_border);
WM_operatortype_append(VIEW3D_OT_zoom_border);
WM_operatortype_append(VIEW3D_OT_manipulator);
WM_operatortype_append(VIEW3D_OT_cursor3d);
WM_operatortype_append(VIEW3D_OT_select_lasso);
WM_operatortype_append(VIEW3D_OT_setcameratoview);
@@ -136,6 +137,7 @@ void view3d_keymap(wmWindowManager *wm)
km = WM_keymap_add_item(keymap, "SKETCH_OT_draw_preview", MOUSEMOVE, KM_ANY, KM_CTRL, 0);
RNA_boolean_set(km->ptr, "snap", 1);
WM_keymap_verify_item(keymap, "VIEW3D_OT_manipulator", ACTIONMOUSE, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "VIEW3D_OT_cursor3d", ACTIONMOUSE, KM_PRESS, 0, 0);
WM_keymap_verify_item(keymap, "VIEW3D_OT_viewrotate", MIDDLEMOUSE, KM_PRESS, 0, 0);

4
source/blender/editors/transform/transform.c
View File

@@ -454,6 +454,7 @@ static void view_editmove(unsigned short event)
#endif
}
#if 0
static char *transform_to_undostr(TransInfo *t)
{
switch (t->mode) {
@@ -500,6 +501,7 @@ static char *transform_to_undostr(TransInfo *t)
}
return "Transform";
}
#endif
/* ************************************************* */
@@ -1460,6 +1462,8 @@ int transformEnd(bContext *C, TransInfo *t)
void initManipulator(int mode)
{
printf("init manipulator mode %d\n", mode);
#if 0 // TRANSFORM_FIX_ME
Trans.state = TRANS_RUNNING;

7
source/blender/editors/transform/transform.h
View File

@@ -481,8 +481,7 @@ void flushTransNodes(TransInfo *t);
void flushTransSeq(TransInfo *t);
/*********************** exported from transform_manipulator.c ********** */
void draw_manipulator_ext(struct ScrArea *sa, int type, char axis, int col, float vec[3], float mat[][3]);
int calc_manipulator_stats(struct ScrArea *sa);
int calc_manipulator_stats(const struct bContext *C);
float get_drawsize(struct ARegion *ar, float *co);
/*********************** TransData Creation and General Handling *********** */
@@ -631,7 +630,7 @@ int createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3])
int addMatrixSpace(struct bContext *C, float mat[3][3], char name[]);
int addObjectSpace(struct bContext *C, struct Object *ob);
void applyTransformOrientation(struct bContext *C, TransInfo *t);
void applyTransformOrientation(const struct bContext *C, TransInfo *t);
#define ORIENTATION_NONE 0
@@ -640,7 +639,7 @@ void applyTransformOrientation(struct bContext *C, TransInfo *t);
#define ORIENTATION_EDGE 3
#define ORIENTATION_FACE 4
int getTransformOrientation(struct bContext *C, float normal[3], float plane[3], int activeOnly);
int getTransformOrientation(const struct bContext *C, float normal[3], float plane[3], int activeOnly);
int createSpaceNormal(float mat[3][3], float normal[3]);
int createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3]);

7
source/blender/editors/transform/transform_conversions.c
View File

@@ -2566,6 +2566,7 @@ int clipUVTransform(TransInfo *t, float *vec, int resize)
* It also makes sure gp-frames are still stored in chronological order after
* transform.
*/
#if 0
static void posttrans_gpd_clean (bGPdata *gpd)
{
bGPDlayer *gpl;
@@ -2650,6 +2651,7 @@ static void posttrans_gpd_clean (bGPdata *gpd)
}
}
}
#endif
/* Called during special_aftertrans_update to make sure selected keyframes replace
* any other keyframes which may reside on that frame (that is not selected).
@@ -2709,6 +2711,7 @@ static void posttrans_fcurve_clean (FCurve *fcu)
}
/* Called by special_aftertrans_update to make sure selected keyframes replace
* any other keyframes which may reside on that frame (that is not selected).
* remake_action_ipos should have already been called
@@ -2783,6 +2786,7 @@ static int count_fcurve_keys(FCurve *fcu, char side, float cfra)
}
/* fully select selected beztriples, but only include if it's on the right side of cfra */
#if 0
static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra)
{
bGPDframe *gpf;
@@ -2801,6 +2805,7 @@ static int count_gplayer_frames(bGPDlayer *gpl, char side, float cfra)
return count;
}
#endif
/* This function assigns the information to transdata */
static void TimeToTransData(TransData *td, float *time, Object *ob)
@@ -2883,6 +2888,7 @@ void flushTransGPactionData (TransInfo *t)
* The 'side' argument is needed for the extend mode. 'B' = both sides, 'R'/'L' mean only data
* on the named side are used.
*/
#if 0
static int GPLayerToTransData (TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl, char side, float cfra)
{
bGPDframe *gpf;
@@ -2909,6 +2915,7 @@ static int GPLayerToTransData (TransData *td, tGPFtransdata *tfd, bGPDlayer *gpl
return count;
}
#endif
static void createTransActionData(bContext *C, TransInfo *t)
{

7
source/blender/editors/transform/transform_generics.c
View File

@@ -114,8 +114,6 @@
extern ListBase editelems;
extern TransInfo Trans; /* From transform.c */
/* ************************** Functions *************************** */
void getViewVector(TransInfo *t, float coord[3], float vec[3])
@@ -1275,9 +1273,12 @@ void calculatePropRatio(TransInfo *t)
}
}
/* XXX only to make manipulators run now */
TransInfo *BIF_GetTransInfo()
{
return NULL;
static struct TransInfo trans;
memset(&trans, 0, sizeof(struct TransInfo));
return &trans;
}
float get_drawsize(ARegion *ar, float *co)

647
source/blender/editors/transform/transform_manipulator.c
View File

@@ -27,18 +27,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
// TRANSFORM_FIX_ME
// Disable everything here, don't need it for now
#if 0
#include <stdlib.h>
#include <string.h>
#include <math.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#ifndef WIN32
#include <unistd.h>
#else
@@ -62,8 +54,10 @@
#include "DNA_view3d_types.h"
#include "BKE_armature.h"
#include "BKE_context.h"
#include "BKE_global.h"
#include "BKE_lattice.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_utildefines.h"
@@ -71,21 +65,21 @@
#include "BLI_arithb.h"
#include "BLI_editVert.h"
#include "BIF_editarmature.h"
#include "BIF_gl.h"
#include "BIF_mywindow.h"
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_space.h"
#include "BIF_transform.h"
#include "BIF_editmesh.h"
#include "BIF_editparticle.h"
#include "BSE_edit.h"
#include "BSE_view.h"
#include "BDR_drawobject.h"
#include "WM_api.h"
#include "WM_types.h"
#include "blendef.h"
#include "ED_armature.h"
#include "ED_mesh.h"
#include "ED_particle.h"
#include "ED_space_api.h"
#include "ED_view3d.h"
#include "UI_resources.h"
/* local module include */
#include "transform.h"
/* return codes for select, and drawing flags */
@@ -113,9 +107,6 @@
#define MAN_GHOST 1
#define MAN_MOVECOL 2
/* GLOBAL VARIABLE THAT SHOULD MOVED TO SCREEN MEMBER OR SOMETHING */
extern TransInfo Trans;
static int is_mat4_flipped(float mat[][4])
{
@@ -127,11 +118,11 @@ static int is_mat4_flipped(float mat[][4])
}
/* transform widget center calc helper for below */
static void calc_tw_center(float *co)
static void calc_tw_center(Scene *scene, float *co)
{
float *twcent= G.scene->twcent;
float *min= G.scene->twmin;
float *max= G.scene->twmax;
float *twcent= scene->twcent;
float *min= scene->twmin;
float *max= scene->twmax;
DO_MINMAX(co, min, max);
VecAddf(twcent, twcent, co);
@@ -162,13 +153,13 @@ static void protectflag_to_drawflags(short protectflag, short *drawflags)
}
/* for pose mode */
static void stats_pose(View3D *v3d, bPoseChannel *pchan)
static void stats_pose(Scene *scene, View3D *v3d, bPoseChannel *pchan)
{
Bone *bone= pchan->bone;
if(bone) {
if (bone->flag & BONE_TRANSFORM) {
calc_tw_center(pchan->pose_head);
calc_tw_center(scene, pchan->pose_head);
protectflag_to_drawflags(pchan->protectflag, &v3d->twdrawflag);
}
}
@@ -209,63 +200,66 @@ static void count_bone_select(TransInfo *t, bArmature *arm, ListBase *lb, int do
/* centroid, boundbox, of selection */
/* returns total items selected */
int calc_manipulator_stats(ScrArea *sa)
int calc_manipulator_stats(const bContext *C)
{
TransInfo *t;
TransInfo *t= BIF_GetTransInfo(); // XXX
ScrArea *sa= CTX_wm_area(C);
ARegion *ar= CTX_wm_region(C);
Scene *scene= CTX_data_scene(C);
Object *obedit= CTX_data_edit_object(C);
View3D *v3d= sa->spacedata.first;
RegionView3D *rv3d= ar->regiondata;
Base *base;
Object *ob= OBACT;
float normal[3]={0.0, 0.0, 0.0};
float plane[3]={0.0, 0.0, 0.0};
int a, totsel=0;
//XXX t = BIF_GetTransInfo();
int a, totsel= 0;
/* transform widget matrix */
Mat4One(v3d->twmat);
Mat4One(rv3d->twmat);
v3d->twdrawflag= 0xFFFF;
/* transform widget centroid/center */
G.scene->twcent[0]= G.scene->twcent[1]= G.scene->twcent[2]= 0.0f;
INIT_MINMAX(G.scene->twmin, G.scene->twmax);
scene->twcent[0]= scene->twcent[1]= scene->twcent[2]= 0.0f;
INIT_MINMAX(scene->twmin, scene->twmax);
if(t->obedit) {
ob= t->obedit;
if((ob->lay & G.vd->lay)==0) return 0;
if(obedit) {
ob= obedit;
if((ob->lay & v3d->lay)==0) return 0;
if(t->obedit->type==OB_MESH) {
EditMesh *em = NULL; // TRANSFORM_FIX_ME
if(obedit->type==OB_MESH) {
EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
EditVert *eve;
EditSelection ese;
float vec[3]= {0,0,0};
/* USE LAST SELECTE WITH ACTIVE */
if (G.vd->around==V3D_ACTIVE && EM_get_actSelection(&ese)) {
if (v3d->around==V3D_ACTIVE && EM_get_actSelection(em, &ese)) {
EM_editselection_center(vec, &ese);
calc_tw_center(vec);
calc_tw_center(scene, vec);
totsel= 1;
} else {
/* do vertices for center, and if still no normal found, use vertex normals */
for(eve= em->verts.first; eve; eve= eve->next) {
if(eve->f & SELECT) {
totsel++;
calc_tw_center(eve->co);
calc_tw_center(scene, eve->co);
}
}
}
} /* end editmesh */
else if (t->obedit->type==OB_ARMATURE){
bArmature *arm= t->obedit->data;
else if (obedit->type==OB_ARMATURE){
bArmature *arm= obedit->data;
EditBone *ebo;
for (ebo=G.edbo.first;ebo;ebo=ebo->next){
for (ebo= arm->edbo->first; ebo; ebo=ebo->next){
if(ebo->layer & arm->layer) {
if (ebo->flag & BONE_TIPSEL) {
calc_tw_center(ebo->tail);
calc_tw_center(scene, ebo->tail);
totsel++;
}
if (ebo->flag & BONE_ROOTSEL) {
calc_tw_center(ebo->head);
calc_tw_center(scene, ebo->head);
totsel++;
}
if (ebo->flag & BONE_SELECTED) {
@@ -274,8 +268,8 @@ int calc_manipulator_stats(ScrArea *sa)
}
}
}
else if ELEM(t->obedit->type, OB_CURVE, OB_SURF) {
Curve *cu= t->obedit->data;
else if ELEM(obedit->type, OB_CURVE, OB_SURF) {
Curve *cu= obedit->data;
Nurb *nu;
BezTriple *bezt;
BPoint *bp;
@@ -292,25 +286,25 @@ int calc_manipulator_stats(ScrArea *sa)
*/
if (G.f & G_HIDDENHANDLES) {
if (bezt->f2 & SELECT) {
calc_tw_center(bezt->vec[1]);
calc_tw_center(scene, bezt->vec[1]);
totsel++;
}
}
else if ( (bezt->f1 & SELECT) + (bezt->f2 & SELECT) + (bezt->f3 & SELECT) > SELECT ) {
calc_tw_center(bezt->vec[1]);
calc_tw_center(scene, bezt->vec[1]);
totsel++;
}
else {
if(bezt->f1) {
calc_tw_center(bezt->vec[0]);
calc_tw_center(scene, bezt->vec[0]);
totsel++;
}
if(bezt->f2) {
calc_tw_center(bezt->vec[1]);
calc_tw_center(scene, bezt->vec[1]);
totsel++;
}
if(bezt->f3) {
calc_tw_center(bezt->vec[2]);
calc_tw_center(scene, bezt->vec[2]);
totsel++;
}
}
@@ -322,7 +316,7 @@ int calc_manipulator_stats(ScrArea *sa)
a= nu->pntsu*nu->pntsv;
while(a--) {
if(bp->f1 & SELECT) {
calc_tw_center(bp->vec);
calc_tw_center(scene, bp->vec);
totsel++;
}
bp++;
@@ -331,29 +325,31 @@ int calc_manipulator_stats(ScrArea *sa)
nu= nu->next;
}
}
else if(t->obedit->type==OB_MBALL) {
else if(obedit->type==OB_MBALL) {
/* editmball.c */
extern ListBase editelems; /* go away ! */
ListBase editelems= {NULL, NULL}; /* XXX */
MetaElem *ml, *ml_sel=NULL;
ml= editelems.first;
while(ml) {
if(ml->flag & SELECT) {
calc_tw_center(&ml->x);
calc_tw_center(scene, &ml->x);
ml_sel = ml;
totsel++;
}
ml= ml->next;
}
}
else if(t->obedit->type==OB_LATTICE) {
else if(obedit->type==OB_LATTICE) {
BPoint *bp;
bp= editLatt->def;
Lattice *lt= obedit->data;
a= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
bp= lt->editlatt->def;
a= lt->editlatt->pntsu*lt->editlatt->pntsv*lt->editlatt->pntsw;
while(a--) {
if(bp->f1 & SELECT) {
calc_tw_center(bp->vec);
calc_tw_center(scene, bp->vec);
totsel++;
}
bp++;
@@ -362,10 +358,10 @@ int calc_manipulator_stats(ScrArea *sa)
/* selection center */
if(totsel) {
VecMulf(G.scene->twcent, 1.0f/(float)totsel); // centroid!
Mat4MulVecfl(t->obedit->obmat, G.scene->twcent);
Mat4MulVecfl(t->obedit->obmat, G.scene->twmin);
Mat4MulVecfl(t->obedit->obmat, G.scene->twmax);
VecMulf(scene->twcent, 1.0f/(float)totsel); // centroid!
Mat4MulVecfl(obedit->obmat, scene->twcent);
Mat4MulVecfl(obedit->obmat, scene->twmin);
Mat4MulVecfl(obedit->obmat, scene->twmax);
}
}
else if(ob && (ob->flag & OB_POSEMODE)) {
@@ -373,34 +369,34 @@ int calc_manipulator_stats(ScrArea *sa)
bPoseChannel *pchan;
int mode;
if((ob->lay & G.vd->lay)==0) return 0;
if((ob->lay & v3d->lay)==0) return 0;
mode = Trans.mode;
Trans.mode = TFM_ROTATION; // mislead counting bones... bah
mode = t->mode;
t->mode = TFM_ROTATION; // mislead counting bones... bah
/* count total, we use same method as transform will do */
Trans.total= 0;
count_bone_select(&Trans, arm, &arm->bonebase, 1);
totsel = Trans.total;
t->total= 0;
count_bone_select(t, arm, &arm->bonebase, 1);
totsel = t->total;
if(totsel) {
/* use channels to get stats */
for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
stats_pose(v3d, pchan);
stats_pose(scene, v3d, pchan);
}
VecMulf(G.scene->twcent, 1.0f/(float)totsel); // centroid!
Mat4MulVecfl(ob->obmat, G.scene->twcent);
Mat4MulVecfl(ob->obmat, G.scene->twmin);
Mat4MulVecfl(ob->obmat, G.scene->twmax);
VecMulf(scene->twcent, 1.0f/(float)totsel); // centroid!
Mat4MulVecfl(ob->obmat, scene->twcent);
Mat4MulVecfl(ob->obmat, scene->twmin);
Mat4MulVecfl(ob->obmat, scene->twmax);
}
/* restore, mode can be TFM_INIT */
Trans.mode = mode;
t->mode = mode;
}
else if(G.f & (G_VERTEXPAINT + G_TEXTUREPAINT + G_WEIGHTPAINT + G_SCULPTMODE)) {
;
}
else if(G.f & G_PARTICLEEDIT) {
ParticleSystem *psys=PE_get_current(OBACT);
ParticleSystem *psys= PE_get_current(scene, ob);
ParticleData *pa = psys->particles;
ParticleEditKey *ek;
int k;
@@ -411,7 +407,7 @@ int calc_manipulator_stats(ScrArea *sa)
for(k=0, ek=psys->edit->keys[a]; k<pa->totkey; k++, ek++) {
if(ek->flag & PEK_SELECT) {
calc_tw_center(ek->world_co);
calc_tw_center(scene, ek->world_co);
totsel++;
}
}
@@ -419,7 +415,7 @@ int calc_manipulator_stats(ScrArea *sa)
/* selection center */
if(totsel)
VecMulf(G.scene->twcent, 1.0f/(float)totsel); // centroid!
VecMulf(scene->twcent, 1.0f/(float)totsel); // centroid!
}
}
else {
@@ -428,11 +424,11 @@ int calc_manipulator_stats(ScrArea *sa)
ob= OBACT;
if(ob && !(ob->flag & SELECT)) ob= NULL;
for(base= G.scene->base.first; base; base= base->next) {
if TESTBASELIB(base) {
for(base= scene->base.first; base; base= base->next) {
if TESTBASELIB(scene, base) {
if(ob==NULL)
ob= base->object;
calc_tw_center(base->object->obmat[3]);
calc_tw_center(scene, base->object->obmat[3]);
protectflag_to_drawflags(base->object->protectflag, &v3d->twdrawflag);
totsel++;
}
@@ -440,7 +436,7 @@ int calc_manipulator_stats(ScrArea *sa)
/* selection center */
if(totsel) {
VecMulf(G.scene->twcent, 1.0f/(float)totsel); // centroid!
VecMulf(scene->twcent, 1.0f/(float)totsel); // centroid!
}
}
@@ -453,13 +449,13 @@ int calc_manipulator_stats(ScrArea *sa)
break;
case V3D_MANIP_NORMAL:
if(t->obedit || ob->flag & OB_POSEMODE) {
if(obedit || ob->flag & OB_POSEMODE) {
float mat[3][3];
int type;
strcpy(t->spacename, "normal");
type = getTransformOrientation(normal, plane, (G.vd->around == V3D_ACTIVE));
type = getTransformOrientation(C, normal, plane, (v3d->around == V3D_ACTIVE));
switch (type)
{
@@ -491,32 +487,32 @@ int calc_manipulator_stats(ScrArea *sa)
if (type == ORIENTATION_NONE)
{
Mat4One(v3d->twmat);
Mat4One(rv3d->twmat);
}
else
{
Mat4CpyMat3(v3d->twmat, mat);
Mat4CpyMat3(rv3d->twmat, mat);
}
break;
}
/* no break we define 'normal' as 'local' in Object mode */
case V3D_MANIP_LOCAL:
strcpy(t->spacename, "local");
Mat4CpyMat4(v3d->twmat, ob->obmat);
Mat4Ortho(v3d->twmat);
Mat4CpyMat4(rv3d->twmat, ob->obmat);
Mat4Ortho(rv3d->twmat);
break;
case V3D_MANIP_VIEW:
{
float mat[3][3];
strcpy(t->spacename, "view");
Mat3CpyMat4(mat, v3d->viewinv);
Mat3CpyMat4(mat, rv3d->viewinv);
Mat3Ortho(mat);
Mat4CpyMat3(v3d->twmat, mat);
Mat4CpyMat3(rv3d->twmat, mat);
}
break;
default: /* V3D_MANIP_CUSTOM */
applyTransformOrientation();
applyTransformOrientation(C, t);
break;
}
@@ -527,7 +523,7 @@ int calc_manipulator_stats(ScrArea *sa)
/* ******************** DRAWING STUFFIES *********** */
static float screen_aligned(float mat[][4])
static float screen_aligned(RegionView3D *rv3d, float mat[][4])
{
float vec[3], size;
@@ -537,7 +533,7 @@ static float screen_aligned(float mat[][4])
glTranslatef(mat[3][0], mat[3][1], mat[3][2]);
/* sets view screen aligned */
glRotatef( -360.0f*saacos(G.vd->viewquat[0])/(float)M_PI, G.vd->viewquat[1], G.vd->viewquat[2], G.vd->viewquat[3]);
glRotatef( -360.0f*saacos(rv3d->viewquat[0])/(float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
return size;
}
@@ -632,7 +628,7 @@ static void partial_donut(float radring, float radhole, int start, int end, int
moving: in transform theme color
else the red/green/blue
*/
static void manipulator_setcolor(char axis, int colcode)
static void manipulator_setcolor(View3D *v3d, char axis, int colcode)
{
float vec[4];
char col[4];
@@ -643,19 +639,19 @@ static void manipulator_setcolor(char axis, int colcode)
glColor4ub(0, 0, 0, 70);
}
else if(colcode==MAN_MOVECOL) {
BIF_GetThemeColor3ubv(TH_TRANSFORM, col);
UI_GetThemeColor3ubv(TH_TRANSFORM, col);
glColor4ub(col[0], col[1], col[2], 128);
}
else {
switch(axis) {
case 'c':
BIF_GetThemeColor3ubv(TH_TRANSFORM, col);
if(G.vd->twmode == V3D_MANIP_LOCAL) {
UI_GetThemeColor3ubv(TH_TRANSFORM, col);
if(v3d->twmode == V3D_MANIP_LOCAL) {
col[0]= col[0]>200?255:col[0]+55;
col[1]= col[1]>200?255:col[1]+55;
col[2]= col[2]>200?255:col[2]+55;
}
else if(G.vd->twmode == V3D_MANIP_NORMAL) {
else if(v3d->twmode == V3D_MANIP_NORMAL) {
col[0]= col[0]<55?0:col[0]-55;
col[1]= col[1]<55?0:col[1]-55;
col[2]= col[2]<55?0:col[2]-55;
@@ -676,12 +672,12 @@ static void manipulator_setcolor(char axis, int colcode)
}
/* viewmatrix should have been set OK, also no shademode! */
static void draw_manipulator_axes(int colcode, int flagx, int flagy, int flagz)
static void draw_manipulator_axes(View3D *v3d, int colcode, int flagx, int flagy, int flagz)
{
/* axes */
if(flagx) {
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
if(flagx & MAN_SCALE_X) glLoadName(MAN_SCALE_X);
else if(flagx & MAN_TRANS_X) glLoadName(MAN_TRANS_X);
glBegin(GL_LINES);
@@ -692,7 +688,7 @@ static void draw_manipulator_axes(int colcode, int flagx, int flagy, int flagz)
if(flagy) {
if(flagy & MAN_SCALE_Y) glLoadName(MAN_SCALE_Y);
else if(flagy & MAN_TRANS_Y) glLoadName(MAN_TRANS_Y);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
glBegin(GL_LINES);
glVertex3f(0.0f, 0.2f, 0.0f);
glVertex3f(0.0f, 1.0f, 0.0f);
@@ -701,7 +697,7 @@ static void draw_manipulator_axes(int colcode, int flagx, int flagy, int flagz)
if(flagz) {
if(flagz & MAN_SCALE_Z) glLoadName(MAN_SCALE_Z);
else if(flagz & MAN_TRANS_Z) glLoadName(MAN_TRANS_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
glBegin(GL_LINES);
glVertex3f(0.0f, 0.0f, 0.2f);
glVertex3f(0.0f, 0.0f, 1.0f);
@@ -710,8 +706,9 @@ static void draw_manipulator_axes(int colcode, int flagx, int flagy, int flagz)
}
/* only called while G.moving */
static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
static void draw_manipulator_rotate_ghost(View3D *v3d, RegionView3D *rv3d, int drawflags)
{
TransInfo *t= BIF_GetTransInfo(); // XXX
GLUquadricObj *qobj;
float size, phi, startphi, vec[3], svec[3], matt[4][4], cross[3], tmat[3][3];
int arcs= (G.rt!=2);
@@ -725,26 +722,26 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
/* we need both [4][4] transforms, Trans.mat seems to be premul, not post for mat[][4] */
Mat4CpyMat4(matt, mat); // to copy the parts outside of [3][3]
Mat4MulMat34(matt, Trans.mat, mat);
/* we need both [4][4] transforms, t->mat seems to be premul, not post for mat[][4] */
Mat4CpyMat4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
Mat4MulMat34(matt, t->mat, rv3d->twmat);
/* Screen aligned view rot circle */
if(drawflags & MAN_ROT_V) {
/* prepare for screen aligned draw */
glPushMatrix();
size= screen_aligned(mat);
size= screen_aligned(rv3d, rv3d->twmat);
vec[0]= (float)(Trans.con.imval[0] - Trans.center2d[0]);
vec[1]= (float)(Trans.con.imval[1] - Trans.center2d[1]);
vec[0]= (float)(t->con.imval[0] - t->center2d[0]);
vec[1]= (float)(t->con.imval[1] - t->center2d[1]);
vec[2]= 0.0f;
Normalize(vec);
startphi= saacos( vec[1] );
if(vec[0]<0.0) startphi= -startphi;
phi= (float)fmod(180.0*Trans.val/M_PI, 360.0);
phi= (float)fmod(180.0*t->val/M_PI, 360.0);
if(phi > 180.0) phi-= 360.0;
else if(phi<-180.0) phi+= 360.0;
@@ -756,13 +753,13 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
float imat[3][3], ivmat[3][3];
/* try to get the start rotation */
svec[0]= (float)(Trans.con.imval[0] - Trans.center2d[0]);
svec[1]= (float)(Trans.con.imval[1] - Trans.center2d[1]);
svec[0]= (float)(t->con.imval[0] - t->center2d[0]);
svec[1]= (float)(t->con.imval[1] - t->center2d[1]);
svec[2]= 0.0f;
/* screen aligned vec transform back to manipulator space */
Mat3CpyMat4(ivmat, G.vd->viewinv);
Mat3CpyMat4(tmat, mat);
Mat3CpyMat4(ivmat, rv3d->viewinv);
Mat3CpyMat4(tmat, rv3d->twmat);
Mat3Inv(imat, tmat);
Mat3MulMat3(tmat, imat, ivmat);
@@ -770,7 +767,7 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
Normalize(svec);
}
mymultmatrix(mat); // aligns with original widget
wmMultMatrix(rv3d->twmat); // aligns with original widget
/* Z disk */
if(drawflags & MAN_ROT_Z) {
@@ -784,13 +781,13 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
}
else startphi= 0.5f*(float)M_PI;
VECCOPY(vec, mat[0]); // use x axis to detect rotation
VECCOPY(vec, rv3d->twmat[0]); // use x axis to detect rotation
Normalize(vec);
Normalize(matt[0]);
phi= saacos( Inpf(vec, matt[0]) );
if(phi!=0.0) {
Crossf(cross, vec, matt[0]); // results in z vector
if(Inpf(cross, mat[2]) > 0.0) phi= -phi;
if(Inpf(cross, rv3d->twmat[2]) > 0.0) phi= -phi;
gluPartialDisk(qobj, 0.0, 1.0, 32, 1, 180.0*startphi/M_PI, 180.0*(phi)/M_PI);
}
}
@@ -806,13 +803,13 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
}
else startphi= 0.0f;
VECCOPY(vec, mat[1]); // use y axis to detect rotation
VECCOPY(vec, rv3d->twmat[1]); // use y axis to detect rotation
Normalize(vec);
Normalize(matt[1]);
phi= saacos( Inpf(vec, matt[1]) );
if(phi!=0.0) {
Crossf(cross, vec, matt[1]); // results in x vector
if(Inpf(cross, mat[0]) > 0.0) phi= -phi;
if(Inpf(cross, rv3d->twmat[0]) > 0.0) phi= -phi;
glRotatef(90.0, 0.0, 1.0, 0.0);
gluPartialDisk(qobj, 0.0, 1.0, 32, 1, 180.0*startphi/M_PI, 180.0*phi/M_PI);
glRotatef(-90.0, 0.0, 1.0, 0.0);
@@ -830,13 +827,13 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
}
else startphi= (float)M_PI;
VECCOPY(vec, mat[2]); // use z axis to detect rotation
VECCOPY(vec, rv3d->twmat[2]); // use z axis to detect rotation
Normalize(vec);
Normalize(matt[2]);
phi= saacos( Inpf(vec, matt[2]) );
if(phi!=0.0) {
Crossf(cross, vec, matt[2]); // results in y vector
if(Inpf(cross, mat[1]) > 0.0) phi= -phi;
if(Inpf(cross, rv3d->twmat[1]) > 0.0) phi= -phi;
glRotatef(-90.0, 1.0, 0.0, 0.0);
gluPartialDisk(qobj, 0.0, 1.0, 32, 1, 180.0*startphi/M_PI, 180.0*phi/M_PI);
glRotatef(90.0, 1.0, 0.0, 0.0);
@@ -844,11 +841,12 @@ static void draw_manipulator_rotate_ghost(float mat[][4], int drawflags)
}
glDisable(GL_BLEND);
myloadmatrix(G.vd->viewmat);
wmLoadMatrix(rv3d->viewmat);
}
static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, int combo)
static void draw_manipulator_rotate(View3D *v3d, RegionView3D *rv3d, int moving, int drawflags, int combo)
{
TransInfo *t= BIF_GetTransInfo(); // XXX
GLUquadricObj *qobj;
double plane[4];
float size, vec[3], unitmat[4][4];
@@ -871,37 +869,37 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
gluQuadricDrawStyle(qobj, GLU_FILL);
/* prepare for screen aligned draw */
VECCOPY(vec, mat[0]);
VECCOPY(vec, rv3d->twmat[0]);
size= Normalize(vec);
glPushMatrix();
glTranslatef(mat[3][0], mat[3][1], mat[3][2]);
glTranslatef(rv3d->twmat[3][0], rv3d->twmat[3][1], rv3d->twmat[3][2]);
if(arcs) {
/* clipplane makes nice handles, calc here because of multmatrix but with translate! */
VECCOPY(plane, G.vd->viewinv[2]);
VECCOPY(plane, rv3d->viewinv[2]);
plane[3]= -0.02*size; // clip just a bit more
glClipPlane(GL_CLIP_PLANE0, plane);
}
/* sets view screen aligned */
glRotatef( -360.0f*saacos(G.vd->viewquat[0])/(float)M_PI, G.vd->viewquat[1], G.vd->viewquat[2], G.vd->viewquat[3]);
glRotatef( -360.0f*saacos(rv3d->viewquat[0])/(float)M_PI, rv3d->viewquat[1], rv3d->viewquat[2], rv3d->viewquat[3]);
/* Screen aligned help circle */
if(arcs) {
if((G.f & G_PICKSEL)==0) {
BIF_ThemeColorShade(TH_BACK, -30);
UI_ThemeColorShade(TH_BACK, -30);
drawcircball(GL_LINE_LOOP, unitmat[3], size, unitmat);
}
}
/* Screen aligned view rot circle */
if(drawflags & MAN_ROT_V) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_V);
BIF_ThemeColor(TH_TRANSFORM);
UI_ThemeColor(TH_TRANSFORM);
drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f*size, unitmat);
if(moving) {
float vec[3];
vec[0]= (float)(Trans.imval[0] - Trans.center2d[0]);
vec[1]= (float)(Trans.imval[1] - Trans.center2d[1]);
vec[0]= (float)(t->imval[0] - t->center2d[0]);
vec[1]= (float)(t->imval[1] - t->center2d[1]);
vec[2]= 0.0f;
Normalize(vec);
VecMulf(vec, 1.2f*size);
@@ -916,14 +914,14 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
/* apply the transform delta */
if(moving) {
float matt[4][4];
Mat4CpyMat4(matt, mat); // to copy the parts outside of [3][3]
Mat4MulMat34(matt, Trans.mat, mat);
mymultmatrix(matt);
Mat4CpyMat4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
Mat4MulMat34(matt, t->mat, rv3d->twmat);
wmMultMatrix(matt);
glFrontFace( is_mat4_flipped(matt)?GL_CW:GL_CCW);
}
else {
glFrontFace( is_mat4_flipped(mat)?GL_CW:GL_CCW);
mymultmatrix(mat);
glFrontFace( is_mat4_flipped(rv3d->twmat)?GL_CW:GL_CCW);
wmMultMatrix(rv3d->twmat);
}
/* axes */
@@ -933,17 +931,17 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
/* axis */
glBegin(GL_LINES);
if( (drawflags & MAN_ROT_X) || (moving && (drawflags & MAN_ROT_Z)) ) {
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
glVertex3f(0.2f, 0.0f, 0.0f);
glVertex3f(1.0f, 0.0f, 0.0f);
}
if( (drawflags & MAN_ROT_Y) || (moving && (drawflags & MAN_ROT_X)) ) {
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
glVertex3f(0.0f, 0.2f, 0.0f);
glVertex3f(0.0f, 1.0f, 0.0f);
}
if( (drawflags & MAN_ROT_Z) || (moving && (drawflags & MAN_ROT_Y)) ) {
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
glVertex3f(0.0f, 0.0f, 0.2f);
glVertex3f(0.0f, 0.0f, 1.0f);
}
@@ -957,14 +955,14 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
/* Z circle */
if(drawflags & MAN_ROT_Z) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
drawcircball(GL_LINE_LOOP, unitmat[3], 1.0, unitmat);
}
/* X circle */
if(drawflags & MAN_ROT_X) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_X);
glRotatef(90.0, 0.0, 1.0, 0.0);
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
drawcircball(GL_LINE_LOOP, unitmat[3], 1.0, unitmat);
glRotatef(-90.0, 0.0, 1.0, 0.0);
}
@@ -972,7 +970,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
if(drawflags & MAN_ROT_Y) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Y);
glRotatef(-90.0, 1.0, 0.0, 0.0);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
drawcircball(GL_LINE_LOOP, unitmat[3], 1.0, unitmat);
glRotatef(90.0, 1.0, 0.0, 0.0);
}
@@ -986,14 +984,14 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
/* Z circle */
if(drawflags & MAN_ROT_Z) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
partial_donut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
}
/* X circle */
if(drawflags & MAN_ROT_X) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_X);
glRotatef(90.0, 0.0, 1.0, 0.0);
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
partial_donut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
glRotatef(-90.0, 0.0, 1.0, 0.0);
}
@@ -1001,7 +999,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
if(drawflags & MAN_ROT_Y) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Y);
glRotatef(-90.0, 1.0, 0.0, 0.0);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
partial_donut(cusize/4.0f, 1.0f, 0, 48, 8, 48);
glRotatef(90.0, 1.0, 0.0, 0.0);
}
@@ -1015,7 +1013,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
if(drawflags & MAN_ROT_Z) {
glPushMatrix();
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
partial_donut(0.7f*cusize, 1.0f, 31, 33, 8, 64);
@@ -1026,7 +1024,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
if(drawflags & MAN_ROT_Y) {
glPushMatrix();
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Y);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
glRotatef(90.0, 1.0, 0.0, 0.0);
glRotatef(90.0, 0.0, 0.0, 1.0);
@@ -1039,7 +1037,7 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
if(drawflags & MAN_ROT_X) {
glPushMatrix();
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_X);
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
glRotatef(-90.0, 0.0, 1.0, 0.0);
glRotatef(90.0, 0.0, 0.0, 1.0);
@@ -1051,14 +1049,77 @@ static void draw_manipulator_rotate(float mat[][4], int moving, int drawflags, i
}
/* restore */
myloadmatrix(G.vd->viewmat);
wmLoadMatrix(rv3d->viewmat);
gluDeleteQuadric(qobj);
if(G.vd->zbuf) glEnable(GL_DEPTH_TEST);
if(v3d->zbuf) glEnable(GL_DEPTH_TEST);
}
static void draw_manipulator_scale(float mat[][4], int moving, int drawflags, int combo, int colcode)
static void drawsolidcube(float size)
{
static float cube[8][3] = {
{-1.0, -1.0, -1.0},
{-1.0, -1.0, 1.0},
{-1.0, 1.0, 1.0},
{-1.0, 1.0, -1.0},
{ 1.0, -1.0, -1.0},
{ 1.0, -1.0, 1.0},
{ 1.0, 1.0, 1.0},
{ 1.0, 1.0, -1.0}, };
float n[3];
glPushMatrix();
glScalef(size, size, size);
n[0]=0; n[1]=0; n[2]=0;
glBegin(GL_QUADS);
n[0]= -1.0;
glNormal3fv(n);
glVertex3fv(cube[0]); glVertex3fv(cube[1]); glVertex3fv(cube[2]); glVertex3fv(cube[3]);
n[0]=0;
glEnd();
glBegin(GL_QUADS);
n[1]= -1.0;
glNormal3fv(n);
glVertex3fv(cube[0]); glVertex3fv(cube[4]); glVertex3fv(cube[5]); glVertex3fv(cube[1]);
n[1]=0;
glEnd();
glBegin(GL_QUADS);
n[0]= 1.0;
glNormal3fv(n);
glVertex3fv(cube[4]); glVertex3fv(cube[7]); glVertex3fv(cube[6]); glVertex3fv(cube[5]);
n[0]=0;
glEnd();
glBegin(GL_QUADS);
n[1]= 1.0;
glNormal3fv(n);
glVertex3fv(cube[7]); glVertex3fv(cube[3]); glVertex3fv(cube[2]); glVertex3fv(cube[6]);
n[1]=0;
glEnd();
glBegin(GL_QUADS);
n[2]= 1.0;
glNormal3fv(n);
glVertex3fv(cube[1]); glVertex3fv(cube[5]); glVertex3fv(cube[6]); glVertex3fv(cube[2]);
n[2]=0;
glEnd();
glBegin(GL_QUADS);
n[2]= -1.0;
glNormal3fv(n);
glVertex3fv(cube[7]); glVertex3fv(cube[4]); glVertex3fv(cube[0]); glVertex3fv(cube[3]);
glEnd();
glPopMatrix();
}
static void draw_manipulator_scale(View3D *v3d, RegionView3D *rv3d, int moving, int drawflags, int combo, int colcode)
{
TransInfo *t= BIF_GetTransInfo(); // XXX
float cywid= 0.25f*0.01f*(float)U.tw_handlesize;
float cusize= cywid*0.75f, dz;
@@ -1070,13 +1131,14 @@ static void draw_manipulator_scale(float mat[][4], int moving, int drawflags, in
/* not in combo mode */
if( (combo & (V3D_MANIP_TRANSLATE|V3D_MANIP_ROTATE))==0) {
float size, unitmat[4][4];
int shift= 0; // XXX
/* center circle, do not add to selection when shift is pressed (planar constraint) */
if( (G.f & G_PICKSEL) && (G.qual & LR_SHIFTKEY)==0) glLoadName(MAN_SCALE_C);
if( (G.f & G_PICKSEL) && shift==0) glLoadName(MAN_SCALE_C);
manipulator_setcolor('c', colcode);
manipulator_setcolor(v3d, 'c', colcode);
glPushMatrix();
size= screen_aligned(mat);
size= screen_aligned(rv3d, rv3d->twmat);
Mat4One(unitmat);
drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
glPopMatrix();
@@ -1088,46 +1150,48 @@ static void draw_manipulator_scale(float mat[][4], int moving, int drawflags, in
if(moving) {
float matt[4][4];
Mat4CpyMat4(matt, mat); // to copy the parts outside of [3][3]
Mat4MulMat34(matt, Trans.mat, mat);
mymultmatrix(matt);
Mat4CpyMat4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
Mat4MulMat34(matt, t->mat, rv3d->twmat);
wmMultMatrix(matt);
glFrontFace( is_mat4_flipped(matt)?GL_CW:GL_CCW);
}
else {
mymultmatrix(mat);
glFrontFace( is_mat4_flipped(mat)?GL_CW:GL_CCW);
wmMultMatrix(rv3d->twmat);
glFrontFace( is_mat4_flipped(rv3d->twmat)?GL_CW:GL_CCW);
}
/* axis */
/* in combo mode, this is always drawn as first type */
draw_manipulator_axes(colcode, drawflags & MAN_SCALE_X, drawflags & MAN_SCALE_Y, drawflags & MAN_SCALE_Z);
draw_manipulator_axes(v3d, colcode, drawflags & MAN_SCALE_X, drawflags & MAN_SCALE_Y, drawflags & MAN_SCALE_Z);
/* Z cube */
glTranslatef(0.0, 0.0, dz);
if(drawflags & MAN_SCALE_Z) {
if(G.f & G_PICKSEL) glLoadName(MAN_SCALE_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
drawsolidcube(cusize);
}
/* X cube */
glTranslatef(dz, 0.0, -dz);
if(drawflags & MAN_SCALE_X) {
if(G.f & G_PICKSEL) glLoadName(MAN_SCALE_X);
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
drawsolidcube(cusize);
}
/* Y cube */
glTranslatef(-dz, dz, 0.0);
if(drawflags & MAN_SCALE_Y) {
if(G.f & G_PICKSEL) glLoadName(MAN_SCALE_Y);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
drawsolidcube(cusize);
}
/* if shiftkey, center point as last, for selectbuffer order */
if(G.f & G_PICKSEL) {
if(G.qual & LR_SHIFTKEY) {
int shift= 0; // XXX
if(shift) {
glTranslatef(0.0, -dz, 0.0);
glLoadName(MAN_SCALE_C);
glBegin(GL_POINTS);
@@ -1137,9 +1201,9 @@ static void draw_manipulator_scale(float mat[][4], int moving, int drawflags, in
}
/* restore */
myloadmatrix(G.vd->viewmat);
wmLoadMatrix(rv3d->viewmat);
if(G.vd->zbuf) glEnable(GL_DEPTH_TEST);
if(v3d->zbuf) glEnable(GL_DEPTH_TEST);
glFrontFace(GL_CCW);
}
@@ -1170,41 +1234,43 @@ static void draw_cylinder(GLUquadricObj *qobj, float len, float width)
}
static void draw_manipulator_translate(float mat[][4], int moving, int drawflags, int combo, int colcode)
static void draw_manipulator_translate(View3D *v3d, RegionView3D *rv3d, int moving, int drawflags, int combo, int colcode)
{
TransInfo *t= BIF_GetTransInfo(); // XXX
GLUquadricObj *qobj;
float cylen= 0.01f*(float)U.tw_handlesize;
float cywid= 0.25f*cylen, dz, size;
float unitmat[4][4];
int shift= 0; // XXX
/* when called while moving in mixed mode, do not draw when... */
if((drawflags & MAN_TRANS_C)==0) return;
if(moving) glTranslatef(Trans.vec[0], Trans.vec[1], Trans.vec[2]);
if(moving) glTranslatef(t->vec[0], t->vec[1], t->vec[2]);
glDisable(GL_DEPTH_TEST);
qobj= gluNewQuadric();
gluQuadricDrawStyle(qobj, GLU_FILL);
/* center circle, do not add to selection when shift is pressed (planar constraint) */
if( (G.f & G_PICKSEL) && (G.qual & LR_SHIFTKEY)==0) glLoadName(MAN_TRANS_C);
if( (G.f & G_PICKSEL) && shift==0) glLoadName(MAN_TRANS_C);
manipulator_setcolor('c', colcode);
manipulator_setcolor(v3d, 'c', colcode);
glPushMatrix();
size= screen_aligned(mat);
size= screen_aligned(rv3d, rv3d->twmat);
Mat4One(unitmat);
drawcircball(GL_LINE_LOOP, unitmat[3], 0.2f*size, unitmat);
glPopMatrix();
/* and now apply matrix, we move to local matrix drawing */
mymultmatrix(mat);
wmMultMatrix(rv3d->twmat);
/* axis */
glLoadName(-1);
// translate drawn as last, only axis when no combo with scale, or for ghosting
if((combo & V3D_MANIP_SCALE)==0 || colcode==MAN_GHOST)
draw_manipulator_axes(colcode, drawflags & MAN_TRANS_X, drawflags & MAN_TRANS_Y, drawflags & MAN_TRANS_Z);
draw_manipulator_axes(v3d, colcode, drawflags & MAN_TRANS_X, drawflags & MAN_TRANS_Y, drawflags & MAN_TRANS_Z);
/* offset in combo mode, for rotate a bit more */
@@ -1216,7 +1282,7 @@ static void draw_manipulator_translate(float mat[][4], int moving, int drawflags
glTranslatef(0.0, 0.0, dz);
if(drawflags & MAN_TRANS_Z) {
if(G.f & G_PICKSEL) glLoadName(MAN_TRANS_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
draw_cone(qobj, cylen, cywid);
}
/* X Cone */
@@ -1224,7 +1290,7 @@ static void draw_manipulator_translate(float mat[][4], int moving, int drawflags
if(drawflags & MAN_TRANS_X) {
if(G.f & G_PICKSEL) glLoadName(MAN_TRANS_X);
glRotatef(90.0, 0.0, 1.0, 0.0);
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
draw_cone(qobj, cylen, cywid);
glRotatef(-90.0, 0.0, 1.0, 0.0);
}
@@ -1233,19 +1299,20 @@ static void draw_manipulator_translate(float mat[][4], int moving, int drawflags
if(drawflags & MAN_TRANS_Y) {
if(G.f & G_PICKSEL) glLoadName(MAN_TRANS_Y);
glRotatef(-90.0, 1.0, 0.0, 0.0);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
draw_cone(qobj, cylen, cywid);
}
gluDeleteQuadric(qobj);
myloadmatrix(G.vd->viewmat);
wmLoadMatrix(rv3d->viewmat);
if(G.vd->zbuf) glEnable(GL_DEPTH_TEST);
if(v3d->zbuf) glEnable(GL_DEPTH_TEST);
}
static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflags, int combo, int colcode)
static void draw_manipulator_rotate_cyl(View3D *v3d, RegionView3D *rv3d, int moving, int drawflags, int combo, int colcode)
{
TransInfo *t= BIF_GetTransInfo(); // XXX
GLUquadricObj *qobj;
float size;
float cylen= 0.01f*(float)U.tw_handlesize;
@@ -1256,7 +1323,7 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag
/* prepare for screen aligned draw */
glPushMatrix();
size= screen_aligned(mat);
size= screen_aligned(rv3d, rv3d->twmat);
glDisable(GL_DEPTH_TEST);
@@ -1268,13 +1335,13 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag
Mat4One(unitmat);
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_V);
BIF_ThemeColor(TH_TRANSFORM);
UI_ThemeColor(TH_TRANSFORM);
drawcircball(GL_LINE_LOOP, unitmat[3], 1.2f*size, unitmat);
if(moving) {
float vec[3];
vec[0]= (float)(Trans.imval[0] - Trans.center2d[0]);
vec[1]= (float)(Trans.imval[1] - Trans.center2d[1]);
vec[0]= (float)(t->imval[0] - t->center2d[0]);
vec[1]= (float)(t->imval[1] - t->center2d[1]);
vec[2]= 0.0f;
Normalize(vec);
VecMulf(vec, 1.2f*size);
@@ -1289,24 +1356,24 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag
/* apply the transform delta */
if(moving) {
float matt[4][4];
Mat4CpyMat4(matt, mat); // to copy the parts outside of [3][3]
if (Trans.flag & T_USES_MANIPULATOR) {
Mat4MulMat34(matt, Trans.mat, mat);
Mat4CpyMat4(matt, rv3d->twmat); // to copy the parts outside of [3][3]
if (t->flag & T_USES_MANIPULATOR) {
Mat4MulMat34(matt, t->mat, rv3d->twmat);
}
mymultmatrix(matt);
wmMultMatrix(matt);
}
else {
mymultmatrix(mat);
wmMultMatrix(rv3d->twmat);
}
glFrontFace( is_mat4_flipped(mat)?GL_CW:GL_CCW);
glFrontFace( is_mat4_flipped(rv3d->twmat)?GL_CW:GL_CCW);
/* axis */
if( (G.f & G_PICKSEL)==0 ) {
// only draw axis when combo didn't draw scale axes
if((combo & V3D_MANIP_SCALE)==0)
draw_manipulator_axes(colcode, drawflags & MAN_ROT_X, drawflags & MAN_ROT_Y, drawflags & MAN_ROT_Z);
draw_manipulator_axes(v3d, colcode, drawflags & MAN_ROT_X, drawflags & MAN_ROT_Y, drawflags & MAN_ROT_Z);
/* only has to be set when not in picking */
gluQuadricDrawStyle(qobj, GLU_FILL);
@@ -1316,7 +1383,7 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag
glTranslatef(0.0, 0.0, 1.0);
if(drawflags & MAN_ROT_Z) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Z);
manipulator_setcolor('z', colcode);
manipulator_setcolor(v3d, 'z', colcode);
draw_cylinder(qobj, cylen, cywid);
}
/* X cyl */
@@ -1324,7 +1391,7 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag
if(drawflags & MAN_ROT_X) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_X);
glRotatef(90.0, 0.0, 1.0, 0.0);
manipulator_setcolor('x', colcode);
manipulator_setcolor(v3d, 'x', colcode);
draw_cylinder(qobj, cylen, cywid);
glRotatef(-90.0, 0.0, 1.0, 0.0);
}
@@ -1333,16 +1400,16 @@ static void draw_manipulator_rotate_cyl(float mat[][4], int moving, int drawflag
if(drawflags & MAN_ROT_Y) {
if(G.f & G_PICKSEL) glLoadName(MAN_ROT_Y);
glRotatef(-90.0, 1.0, 0.0, 0.0);
manipulator_setcolor('y', colcode);
manipulator_setcolor(v3d, 'y', colcode);
draw_cylinder(qobj, cylen, cywid);
}
/* restore */
gluDeleteQuadric(qobj);
myloadmatrix(G.vd->viewmat);
wmLoadMatrix(rv3d->viewmat);
if(G.vd->zbuf) glEnable(GL_DEPTH_TEST);
if(v3d->zbuf) glEnable(GL_DEPTH_TEST);
}
@@ -1359,63 +1426,18 @@ static float get_manipulator_drawsize(ARegion *ar)
return size;
}
/* exported to transform_constraints.c */
/* mat, vec = default orientation and location */
/* type = transform type */
/* axis = x, y, z, c */
/* col: 0 = colored, 1 = moving, 2 = ghost */
void draw_manipulator_ext(ScrArea *sa, int type, char axis, int col, float vec[3], float mat[][3])
{
int drawflags= 0;
float mat4[4][4];
int colcode;
Mat4CpyMat3(mat4, mat);
VECCOPY(mat4[3], vec);
Mat4MulFloat3((float *)mat4, get_manipulator_drawsize(sa));
glEnable(GL_BLEND); // let's do it transparent by default
if(col==0) colcode= MAN_RGB;
else if(col==1) colcode= MAN_MOVECOL;
else colcode= MAN_GHOST;
if(type==TFM_ROTATION) {
if(axis=='x') drawflags= MAN_ROT_X;
else if(axis=='y') drawflags= MAN_ROT_Y;
else if(axis=='z') drawflags= MAN_ROT_Z;
else drawflags= MAN_ROT_C;
draw_manipulator_rotate_cyl(mat4, col, drawflags, V3D_MANIP_ROTATE, colcode);
}
else if(type==TFM_RESIZE) {
if(axis=='x') drawflags= MAN_SCALE_X;
else if(axis=='y') drawflags= MAN_SCALE_Y;
else if(axis=='z') drawflags= MAN_SCALE_Z;
else drawflags= MAN_SCALE_C;
draw_manipulator_scale(mat4, col, drawflags, V3D_MANIP_SCALE, colcode);
}
else {
if(axis=='x') drawflags= MAN_TRANS_X;
else if(axis=='y') drawflags= MAN_TRANS_Y;
else if(axis=='z') drawflags= MAN_TRANS_Z;
else drawflags= MAN_TRANS_C;
draw_manipulator_translate(mat4, 0, drawflags, V3D_MANIP_TRANSLATE, colcode);
}
glDisable(GL_BLEND);
}
/* main call, does calc centers & orientation too */
/* uses global G.moving */
static int drawflags= 0xFFFF; // only for the calls below, belongs in scene...?
void BIF_draw_manipulator(ScrArea *sa)
void BIF_draw_manipulator(const bContext *C)
{
ScrArea *sa= CTX_wm_area(C);
ARegion *ar= CTX_wm_region(C);
Scene *scene= CTX_data_scene(C);
View3D *v3d= sa->spacedata.first;
RegionView3D *rv3d= ar->regiondata;
int totsel;
if(!(v3d->twflag & V3D_USE_MANIPULATOR)) return;
@@ -1424,7 +1446,7 @@ void BIF_draw_manipulator(ScrArea *sa)
if(G.moving==0) {
v3d->twflag &= ~V3D_DRAW_MANIPULATOR;
totsel= calc_manipulator_stats(sa);
totsel= calc_manipulator_stats(C);
if(totsel==0) return;
drawflags= v3d->twdrawflag; /* set in calc_manipulator_stats */
@@ -1434,25 +1456,25 @@ void BIF_draw_manipulator(ScrArea *sa)
switch(v3d->around) {
case V3D_CENTER:
case V3D_ACTIVE:
v3d->twmat[3][0]= (G.scene->twmin[0] + G.scene->twmax[0])/2.0f;
v3d->twmat[3][1]= (G.scene->twmin[1] + G.scene->twmax[1])/2.0f;
v3d->twmat[3][2]= (G.scene->twmin[2] + G.scene->twmax[2])/2.0f;
if(v3d->around==V3D_ACTIVE && t->obedit==NULL) {
rv3d->twmat[3][0]= (scene->twmin[0] + scene->twmax[0])/2.0f;
rv3d->twmat[3][1]= (scene->twmin[1] + scene->twmax[1])/2.0f;
rv3d->twmat[3][2]= (scene->twmin[2] + scene->twmax[2])/2.0f;
if(v3d->around==V3D_ACTIVE && scene->obedit==NULL) {
Object *ob= OBACT;
if(ob && !(ob->flag & OB_POSEMODE))
VECCOPY(v3d->twmat[3], ob->obmat[3]);
VECCOPY(rv3d->twmat[3], ob->obmat[3]);
}
break;
case V3D_LOCAL:
case V3D_CENTROID:
VECCOPY(v3d->twmat[3], G.scene->twcent);
VECCOPY(rv3d->twmat[3], scene->twcent);
break;
case V3D_CURSOR:
VECCOPY(v3d->twmat[3], give_cursor());
VECCOPY(rv3d->twmat[3], give_cursor(scene, v3d));
break;
}
Mat4MulFloat3((float *)v3d->twmat, get_manipulator_drawsize(sa));
Mat4MulFloat3((float *)rv3d->twmat, get_manipulator_drawsize(ar));
}
if(v3d->twflag & V3D_DRAW_MANIPULATOR) {
@@ -1460,60 +1482,58 @@ void BIF_draw_manipulator(ScrArea *sa)
if(v3d->twtype & V3D_MANIP_ROTATE) {
/* rotate has special ghosting draw, for pie chart */
if(G.moving) draw_manipulator_rotate_ghost(v3d->twmat, drawflags);
if(G.moving) draw_manipulator_rotate_ghost(v3d, rv3d, drawflags);
if(G.moving) glEnable(GL_BLEND);
if(G.rt==3) {
if(G.moving) draw_manipulator_rotate_cyl(v3d->twmat, 1, drawflags, v3d->twtype, MAN_MOVECOL);
else draw_manipulator_rotate_cyl(v3d->twmat, 0, drawflags, v3d->twtype, MAN_RGB);
if(G.moving) draw_manipulator_rotate_cyl(v3d, rv3d, 1, drawflags, v3d->twtype, MAN_MOVECOL);
else draw_manipulator_rotate_cyl(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_RGB);
}
else
draw_manipulator_rotate(v3d->twmat, G.moving, drawflags, v3d->twtype);
draw_manipulator_rotate(v3d, rv3d, G.moving, drawflags, v3d->twtype);
glDisable(GL_BLEND);
}
if(v3d->twtype & V3D_MANIP_SCALE) {
if(G.moving) {
glEnable(GL_BLEND);
draw_manipulator_scale(v3d->twmat, 0, drawflags, v3d->twtype, MAN_GHOST);
draw_manipulator_scale(v3d->twmat, 1, drawflags, v3d->twtype, MAN_MOVECOL);
draw_manipulator_scale(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_GHOST);
draw_manipulator_scale(v3d, rv3d, 1, drawflags, v3d->twtype, MAN_MOVECOL);
glDisable(GL_BLEND);
}
else draw_manipulator_scale(v3d->twmat, 0, drawflags, v3d->twtype, MAN_RGB);
else draw_manipulator_scale(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_RGB);
}
if(v3d->twtype & V3D_MANIP_TRANSLATE) {
if(G.moving) {
glEnable(GL_BLEND);
draw_manipulator_translate(v3d->twmat, 0, drawflags, v3d->twtype, MAN_GHOST);
draw_manipulator_translate(v3d->twmat, 1, drawflags, v3d->twtype, MAN_MOVECOL);
draw_manipulator_translate(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_GHOST);
draw_manipulator_translate(v3d, rv3d, 1, drawflags, v3d->twtype, MAN_MOVECOL);
glDisable(GL_BLEND);
}
else draw_manipulator_translate(v3d->twmat, 0, drawflags, v3d->twtype, MAN_RGB);
else draw_manipulator_translate(v3d, rv3d, 0, drawflags, v3d->twtype, MAN_RGB);
}
}
}
static int manipulator_selectbuf(ScrArea *sa, float hotspot)
static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, short *mval, float hotspot)
{
View3D *v3d= sa->spacedata.first;
RegionView3D *rv3d= ar->regiondata;
rctf rect;
GLuint buffer[64]; // max 4 items per select, so large enuf
short hits, mval[2];
short hits;
extern void setwinmatrixview3d(ARegion *ar, View3D *v3d, rctf *rect); // XXX check a bit later on this... (ton)
G.f |= G_PICKSEL;
getmouseco_areawin(mval);
rect.xmin= mval[0]-hotspot;
rect.xmax= mval[0]+hotspot;
rect.ymin= mval[1]-hotspot;
rect.ymax= mval[1]+hotspot;
/* get rid of overlay button matrix */
persp(PERSP_VIEW);
setwinmatrixview3d(sa->winx, sa->winy, &rect);
Mat4MulMat4(v3d->persmat, v3d->viewmat, sa->winmat);
setwinmatrixview3d(ar, v3d, &rect);
Mat4MulMat4(rv3d->persmat, rv3d->viewmat, rv3d->winmat);
glSelectBuffer( 64, buffer);
glRenderMode(GL_SELECT);
@@ -1522,22 +1542,20 @@ static int manipulator_selectbuf(ScrArea *sa, float hotspot)
/* do the drawing */
if(v3d->twtype & V3D_MANIP_ROTATE) {
if(G.rt==3) draw_manipulator_rotate_cyl(v3d->twmat, 0, MAN_ROT_C & v3d->twdrawflag, v3d->twtype, MAN_RGB);
else draw_manipulator_rotate(v3d->twmat, 0, MAN_ROT_C & v3d->twdrawflag, v3d->twtype);
if(G.rt==3) draw_manipulator_rotate_cyl(v3d, rv3d, 0, MAN_ROT_C & v3d->twdrawflag, v3d->twtype, MAN_RGB);
else draw_manipulator_rotate(v3d, rv3d, 0, MAN_ROT_C & v3d->twdrawflag, v3d->twtype);
}
if(v3d->twtype & V3D_MANIP_SCALE)
draw_manipulator_scale(v3d->twmat, 0, MAN_SCALE_C & v3d->twdrawflag, v3d->twtype, MAN_RGB);
draw_manipulator_scale(v3d, rv3d, 0, MAN_SCALE_C & v3d->twdrawflag, v3d->twtype, MAN_RGB);
if(v3d->twtype & V3D_MANIP_TRANSLATE)
draw_manipulator_translate(v3d->twmat, 0, MAN_TRANS_C & v3d->twdrawflag, v3d->twtype, MAN_RGB);
draw_manipulator_translate(v3d, rv3d, 0, MAN_TRANS_C & v3d->twdrawflag, v3d->twtype, MAN_RGB);
glPopName();
hits= glRenderMode(GL_RENDER);
G.f &= ~G_PICKSEL;
setwinmatrixview3d(sa->winx, sa->winy, NULL);
Mat4MulMat4(v3d->persmat, v3d->viewmat, sa->winmat);
persp(PERSP_WIN);
setwinmatrixview3d(ar, v3d, NULL);
Mat4MulMat4(rv3d->persmat, rv3d->viewmat, rv3d->winmat);
if(hits==1) return buffer[3];
else if(hits>1) {
@@ -1578,20 +1596,26 @@ static int manipulator_selectbuf(ScrArea *sa, float hotspot)
}
/* return 0; nothing happened */
int BIF_do_manipulator(ScrArea *sa)
int BIF_do_manipulator(bContext *C, short mval[2])
{
ScrArea *sa= CTX_wm_area(C);
View3D *v3d= sa->spacedata.first;
ARegion *ar= CTX_wm_region(C);
RegionView3D *rv3d= ar->regiondata;
int val;
int shift= 0; // XXX
if(!(v3d->twflag & V3D_USE_MANIPULATOR)) return 0;
if(!(v3d->twflag & V3D_DRAW_MANIPULATOR)) return 0;
// find the hotspots first test narrow hotspot
val= manipulator_selectbuf(sa, 0.5f*(float)U.tw_hotspot);
val= manipulator_selectbuf(sa, ar, mval, 0.5f*(float)U.tw_hotspot);
if(val) {
checkFirstTime(); // TEMPORARY, check this before doing any transform call.
// XXX checkFirstTime(); // TEMPORARY, check this before doing any transform call.
// drawflags still global, for drawing call above
drawflags= manipulator_selectbuf(sa, 0.2f*(float)U.tw_hotspot);
drawflags= manipulator_selectbuf(sa, ar, mval, 0.2f*(float)U.tw_hotspot);
if(drawflags==0) drawflags= val;
if (drawflags & MAN_TRANS_C) {
@@ -1600,28 +1624,28 @@ int BIF_do_manipulator(ScrArea *sa)
case MAN_TRANS_C:
break;
case MAN_TRANS_X:
if(G.qual & LR_SHIFTKEY) {
if(shift) {
drawflags= MAN_TRANS_Y|MAN_TRANS_Z;
BIF_setDualAxisConstraint(v3d->twmat[1], v3d->twmat[2], " Y+Z");
BIF_setDualAxisConstraint(rv3d->twmat[1], rv3d->twmat[2], " Y+Z");
}
else
BIF_setSingleAxisConstraint(v3d->twmat[0], " X");
BIF_setSingleAxisConstraint(rv3d->twmat[0], " X");
break;
case MAN_TRANS_Y:
if(G.qual & LR_SHIFTKEY) {
if(shift) {
drawflags= MAN_TRANS_X|MAN_TRANS_Z;
BIF_setDualAxisConstraint(v3d->twmat[0], v3d->twmat[2], " X+Z");
BIF_setDualAxisConstraint(rv3d->twmat[0], rv3d->twmat[2], " X+Z");
}
else
BIF_setSingleAxisConstraint(v3d->twmat[1], " Y");
BIF_setSingleAxisConstraint(rv3d->twmat[1], " Y");
break;
case MAN_TRANS_Z:
if(G.qual & LR_SHIFTKEY) {
if(shift) {
drawflags= MAN_TRANS_X|MAN_TRANS_Y;
BIF_setDualAxisConstraint(v3d->twmat[0], v3d->twmat[1], " X+Y");
BIF_setDualAxisConstraint(rv3d->twmat[0], rv3d->twmat[1], " X+Y");
}
else
BIF_setSingleAxisConstraint(v3d->twmat[2], " Z");
BIF_setSingleAxisConstraint(rv3d->twmat[2], " Z");
break;
}
ManipulatorTransform();
@@ -1630,28 +1654,28 @@ int BIF_do_manipulator(ScrArea *sa)
initManipulator(TFM_RESIZE);
switch(drawflags) {
case MAN_SCALE_X:
if(G.qual & LR_SHIFTKEY) {
if(shift) {
drawflags= MAN_SCALE_Y|MAN_SCALE_Z;
BIF_setDualAxisConstraint(v3d->twmat[1], v3d->twmat[2], " Y+Z");
BIF_setDualAxisConstraint(rv3d->twmat[1], rv3d->twmat[2], " Y+Z");
}
else
BIF_setSingleAxisConstraint(v3d->twmat[0], " X");
BIF_setSingleAxisConstraint(rv3d->twmat[0], " X");
break;
case MAN_SCALE_Y:
if(G.qual & LR_SHIFTKEY) {
if(shift) {
drawflags= MAN_SCALE_X|MAN_SCALE_Z;
BIF_setDualAxisConstraint(v3d->twmat[0], v3d->twmat[2], " X+Z");
BIF_setDualAxisConstraint(rv3d->twmat[0], rv3d->twmat[2], " X+Z");
}
else
BIF_setSingleAxisConstraint(v3d->twmat[1], " Y");
BIF_setSingleAxisConstraint(rv3d->twmat[1], " Y");
break;
case MAN_SCALE_Z:
if(G.qual & LR_SHIFTKEY) {
if(shift) {
drawflags= MAN_SCALE_X|MAN_SCALE_Y;
BIF_setDualAxisConstraint(v3d->twmat[0], v3d->twmat[1], " X+Y");
BIF_setDualAxisConstraint(rv3d->twmat[0], rv3d->twmat[1], " X+Y");
}
else
BIF_setSingleAxisConstraint(v3d->twmat[2], " Z");
BIF_setSingleAxisConstraint(rv3d->twmat[2], " Z");
break;
}
ManipulatorTransform();
@@ -1664,13 +1688,13 @@ int BIF_do_manipulator(ScrArea *sa)
initManipulator(TFM_ROTATION);
switch(drawflags) {
case MAN_ROT_X:
BIF_setSingleAxisConstraint(v3d->twmat[0], " X");
BIF_setSingleAxisConstraint(rv3d->twmat[0], " X");
break;
case MAN_ROT_Y:
BIF_setSingleAxisConstraint(v3d->twmat[1], " Y");
BIF_setSingleAxisConstraint(rv3d->twmat[1], " Y");
break;
case MAN_ROT_Z:
BIF_setSingleAxisConstraint(v3d->twmat[2], " Z");
BIF_setSingleAxisConstraint(rv3d->twmat[2], " Z");
break;
}
ManipulatorTransform();
@@ -1682,4 +1706,3 @@ int BIF_do_manipulator(ScrArea *sa)
return val;
}
#endif

4
source/blender/editors/transform/transform_orientations.c
View File

@@ -402,7 +402,7 @@ int BIF_countTransformOrientation(const bContext *C) {
return count;
}
void applyTransformOrientation(bContext *C, TransInfo *t) {
void applyTransformOrientation(const bContext *C, TransInfo *t) {
TransformOrientation *ts;
View3D *v3d = CTX_wm_view3d(C);
int selected_index = (v3d->twmode - V3D_MANIP_CUSTOM);
@@ -532,7 +532,7 @@ void initTransformOrientation(bContext *C, TransInfo *t)
}
}
int getTransformOrientation(bContext *C, float normal[3], float plane[3], int activeOnly)
int getTransformOrientation(const bContext *C, float normal[3], float plane[3], int activeOnly)
{
Scene *scene = CTX_data_scene(C);
View3D *v3d = CTX_wm_view3d(C);

3
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -82,6 +82,9 @@ typedef struct RegionView3D {
float viewmatob[4][4];
float persmatob[4][4];
/* transform widget matrix */
float twmat[4][4];
float viewquat[4], dist, zfac; /* zfac is initgrabz() result */
float camdx, camdy; /* camera view offsets, 1.0 = viewplane moves entire width/height */
float pixsize;

5
source/blender/makesrna/intern/rna_space.c
View File

@@ -547,23 +547,28 @@ static void rna_def_space_3dview(BlenderRNA *brna)
prop= RNA_def_property(srna, "manipulator", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "twflag", V3D_USE_MANIPULATOR);
RNA_def_property_ui_text(prop, "Manipulator", "Use a 3D manipulator widget for controlling transforms.");
RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
prop= RNA_def_property(srna, "manipulator_translate", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_TRANSLATE);
RNA_def_property_ui_text(prop, "Manipulator Translate", "Use the manipulator for movement transformations.");
RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
prop= RNA_def_property(srna, "manipulator_rotate", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_ROTATE);
RNA_def_property_ui_text(prop, "Manipulator Rotate", "Use the manipulator for rotation transformations.");
RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
prop= RNA_def_property(srna, "manipulator_scale", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "twtype", V3D_MANIP_SCALE);
RNA_def_property_ui_text(prop, "Manipulator Scale", "Use the manipulator for scale transformations.");
RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
prop= RNA_def_property(srna, "transform_orientation", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "twmode");
RNA_def_property_enum_items(prop, transform_orientation_items);
RNA_def_property_ui_text(prop, "Transform Orientation", "The alignment of manipulator handles.");
RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, NULL);
}