diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-20 03:00:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-20 05:02:59 +0400 |
commit | ea58918171e7135e146e6bb90d988908d7c1540f (patch) | |
tree | e87ce0f4ddcedee7e4354c2335eb9a08bf1fab39 /source/blender/makesrna/intern/rna_userdef.c | |
parent | 5fb72b7ee55358f92fe965e5dae5de971c62bff8 (diff) |
NDOF: define 2 default navigation modes: free & orbit
After some discussion it seems both are valid defaults but useful for
very different purposes.
- 'free' lets you explore the scene with full 6dof (like fly mode)
- 'orbit' is closer to typical mouse view orbit, constraining to orbiting about a central location.
This doesn't effect orbit/pan which are available with modifier keys.
Diffstat (limited to 'source/blender/makesrna/intern/rna_userdef.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 0910ee65d6b..cca619c1a55 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3947,19 +3947,25 @@ static void rna_def_userdef_input(BlenderRNA *brna) {0, "RIGHT", 0, "Right", "Use Right Mouse Button for selection"}, {0, NULL, 0, NULL, NULL} }; - + static EnumPropertyItem view_rotation_items[] = { {0, "TURNTABLE", 0, "Turntable", "Use turntable style rotation in the viewport"}, {USER_TRACKBALL, "TRACKBALL", 0, "Trackball", "Use trackball style rotation in the viewport"}, {0, NULL, 0, NULL, NULL} }; + static EnumPropertyItem ndof_view_navigation_items[] = { + {0, "FREE", 0, "Free", "Use full 6 degrees of freedom by default"}, + {NDOF_MODE_ORBIT, "ORBIT", 0, "Orbit", "Orbit about the view center by default"}, + {0, NULL, 0, NULL, NULL} + }; + static EnumPropertyItem ndof_view_rotation_items[] = { {NDOF_TURNTABLE, "TURNTABLE", 0, "Turntable", "Use turntable style rotation in the viewport"}, {0, "TRACKBALL", 0, "Trackball", "Use trackball style rotation in the viewport"}, {0, NULL, 0, NULL, NULL} }; - + static EnumPropertyItem view_zoom_styles[] = { {USER_ZOOM_CONT, "CONTINUE", 0, "Continue", "Old style zoom, continues while moving mouse up or down"}, {USER_ZOOM_DOLLY, "DOLLY", 0, "Dolly", "Zoom in and out based on vertical mouse movement"}, @@ -4062,6 +4068,11 @@ static void rna_def_userdef_input(BlenderRNA *brna) /* TODO: update description when fly-mode visuals are in place ("projected position in fly mode")*/ /* 3D view */ + prop = RNA_def_property(srna, "ndof_view_navigate_method", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_bitflag_sdna(prop, NULL, "ndof_flag"); + RNA_def_property_enum_items(prop, ndof_view_navigation_items); + RNA_def_property_ui_text(prop, "NDOF View Navigate", "Navigation style in the viewport"); + prop = RNA_def_property(srna, "ndof_view_rotate_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "ndof_flag"); RNA_def_property_enum_items(prop, ndof_view_rotation_items); |