diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 23:42:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-07 23:42:22 +0400 |
commit | 5ebe91ca1f75526f95324f0bc16f38fec5b632f2 (patch) | |
tree | 61fcebe9b44268422320e5933b3e38b3ac1164e0 /source/blender/makesdna | |
parent | e5464db95dc22b75f54839903bf1e9122042175e (diff) |
change camera zoom from short to float.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 0758e6e1713..610513ca860 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -94,42 +94,45 @@ typedef struct RegionView3D { float viewmatob[4][4]; float persmatob[4][4]; - /* transform widget matrix */ - float twmat[4][4]; - float viewquat[4]; /* view rotation, must be kept normalized */ - float dist; /* distance from 'ofs' along -viewinv[2] vector, where result is negative as is 'ofs' */ - float zfac; /* initgrabz() result */ - float camdx, camdy; /* camera view offsets, 1.0 = viewplane moves entire width/height */ - float pixsize; /* runtime only */ - float ofs[3]; /* view center & orbit pivot, negative of worldspace location, - * also matches -viewinv[3][0:3] in ortho mode.*/ - short camzoom; /* viewport zoom on the camera frame, see BKE_screen_view3d_zoom_to_fac */ - short twdrawflag; - char is_persp; /* check if persp/ortho view, since 'persp' cant be used for this since - * it can have cameras assigned as well. (only set in setwinmatrixview3d) */ - char pad[3]; - - short rflag, viewlock; - short persp; - short view; - /* user defined clipping planes */ float clip[6][4]; float clip_local[6][4]; /* clip in object space, means we can test for clipping in editmode without first going into worldspace */ - struct BoundBox *clipbb; - + struct BoundBox *clipbb; + struct bGPdata *gpd; /* Grease-Pencil Data (annotation layers) */ - + struct RegionView3D *localvd; /* allocated backup of its self while in localview */ struct RenderInfo *ri; struct RenderEngine *render_engine; struct ViewDepths *depths; - + /* animated smooth view */ struct SmoothViewStore *sms; struct wmTimer *smooth_timer; + + + /* transform widget matrix */ + float twmat[4][4]; + + float viewquat[4]; /* view rotation, must be kept normalized */ + float dist; /* distance from 'ofs' along -viewinv[2] vector, where result is negative as is 'ofs' */ + float zfac; /* initgrabz() result */ + float camdx, camdy; /* camera view offsets, 1.0 = viewplane moves entire width/height */ + float pixsize; /* runtime only */ + float ofs[3]; /* view center & orbit pivot, negative of worldspace location, + * also matches -viewinv[3][0:3] in ortho mode.*/ + float camzoom; /* viewport zoom on the camera frame, see BKE_screen_view3d_zoom_to_fac */ + char is_persp; /* check if persp/ortho view, since 'persp' cant be used for this since + * it can have cameras assigned as well. (only set in setwinmatrixview3d) */ + char persp; + char view; + char viewlock; + + short twdrawflag; + short rflag; + /* last view */ float lviewquat[4]; short lpersp, lview; /* lpersp can never be set to 'RV3D_CAMOB' */ @@ -137,11 +140,10 @@ typedef struct RegionView3D { float twangle[3]; + /* active rotation from NDOF or elsewhere */ float rot_angle; float rot_axis[3]; - - char pad2[4]; } RegionView3D; |