blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 744 Projects 19 Wiki Activity

Manipulator: Move types into their own directory

This commit is contained in:
Campbell Barton 2017-06-21 16:21:19 +10:00
parent b7669ac1c6
commit c3a8b51413
10 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/manipulator_library/CMakeLists.txt
View File

@ -37,21 +37,20 @@ set(INC_SYS
)
set(SRC
arrow2d_manipulator.c
arrow3d_manipulator.c
cage2d_manipulator.c
dial3d_manipulator.c
grab3d_manipulator.c
geom_arrow_manipulator.c
geom_cube_manipulator.c
geom_dial_manipulator.c
manipulator_draw_utils.c
manipulator_library_presets.c
manipulator_library_utils.c
primitive3d_manipulator.c
manipulator_geometry.h
manipulator_library_intern.h
manipulator_library_presets.c
manipulator_library_utils.c
geometry/geom_arrow_manipulator.c
geometry/geom_cube_manipulator.c
geometry/geom_dial_manipulator.c
manipulator_types/arrow2d_manipulator.c
manipulator_types/arrow3d_manipulator.c
manipulator_types/cage2d_manipulator.c
manipulator_types/dial3d_manipulator.c
manipulator_types/grab3d_manipulator.c
manipulator_types/primitive3d_manipulator.c
)
add_definitions(${GL_DEFINITIONS})

2
source/blender/editors/manipulator_library/geom_arrow_manipulator.c → source/blender/editors/manipulator_library/geometry/geom_arrow_manipulator.c
View File

@ -25,7 +25,7 @@
* \ingroup wm
*/
#include "manipulator_geometry.h"
#include "../manipulator_geometry.h"
static float verts[][3] = {
{-0.000000, 0.012320, 0.000000},

2
source/blender/editors/manipulator_library/geom_cube_manipulator.c → source/blender/editors/manipulator_library/geometry/geom_cube_manipulator.c
View File

@ -27,7 +27,7 @@
* \ingroup wm
*/
#include "manipulator_geometry.h"
#include "../manipulator_geometry.h"
static const float verts[][3] = {
{1.000000, 1.000000, -1.000000},

2
source/blender/editors/manipulator_library/geom_dial_manipulator.c → source/blender/editors/manipulator_library/geometry/geom_dial_manipulator.c
View File

@ -25,7 +25,7 @@
* \ingroup wm
*/
#include "manipulator_geometry.h"
#include "../manipulator_geometry.h"
static const float verts[][3] = {
{1.034000, 0.000000, 0.000000},

4
source/blender/editors/manipulator_library/arrow2d_manipulator.c → source/blender/editors/manipulator_library/manipulator_types/arrow2d_manipulator.c
View File

@ -58,7 +58,7 @@
/* own includes */
#include "WM_api.h"
#include "manipulator_library_intern.h"
#include "../manipulator_library_intern.h"
static void arrow2d_draw_geom(wmManipulator *mpr, const float matrix[4][4], const float color[4])
{
@ -212,4 +212,4 @@ void ED_manipulatortypes_arrow_2d(void)
WM_manipulatortype_append(MANIPULATOR_WT_arrow_2d);
}
/** \} */ /* Arrow Manipulator API */
/** \} */

6
source/blender/editors/manipulator_library/arrow3d_manipulator.c → source/blender/editors/manipulator_library/manipulator_types/arrow3d_manipulator.c
View File

@ -65,8 +65,8 @@
#include "WM_api.h"
/* own includes */
#include "manipulator_geometry.h"
#include "manipulator_library_intern.h"
#include "../manipulator_geometry.h"
#include "../manipulator_library_intern.h"
/* to use custom arrows exported to geom_arrow_manipulator.c */
//#define USE_MANIPULATOR_CUSTOM_ARROWS
@ -491,4 +491,4 @@ void ED_manipulatortypes_arrow_3d(void)
WM_manipulatortype_append(MANIPULATOR_WT_arrow_3d);
}
/** \} */ /* Arrow Manipulator API */
/** \} */

2
source/blender/editors/manipulator_library/cage2d_manipulator.c → source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
View File

@ -617,4 +617,4 @@ void ED_manipulatortypes_cage_2d(void)
WM_manipulatortype_append(MANIPULATOR_WT_cage_2d);
}
/** \} */ // Cage Manipulator API
/** \} */

6
source/blender/editors/manipulator_library/dial3d_manipulator.c → source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
View File

@ -65,8 +65,8 @@
#include "WM_types.h"
/* own includes */
#include "manipulator_geometry.h"
#include "manipulator_library_intern.h"
#include "../manipulator_geometry.h"
#include "../manipulator_library_intern.h"
/* to use custom dials exported to geom_dial_manipulator.c */
// #define USE_MANIPULATOR_CUSTOM_DIAL
@ -464,4 +464,4 @@ void ED_manipulatortypes_dial_3d(void)
WM_manipulatortype_append(MANIPULATOR_WT_dial_3d);
}
/** \} */ // Dial Manipulator API
/** \} */

4
source/blender/editors/manipulator_library/grab3d_manipulator.c → source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
View File

@ -60,8 +60,8 @@
#include "WM_types.h"
/* own includes */
#include "manipulator_geometry.h"
#include "manipulator_library_intern.h"
#include "../manipulator_geometry.h"
#include "../manipulator_library_intern.h"
static void manipulator_grab_modal(bContext *C, wmManipulator *mpr, const wmEvent *event, const int flag);

6
source/blender/editors/manipulator_library/primitive3d_manipulator.c → source/blender/editors/manipulator_library/manipulator_types/primitive3d_manipulator.c
View File

@ -18,7 +18,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
/** \file primitive_manipulator.c
/** \file primitive3d_manipulator.c
* \ingroup wm
*
* \name Primitive Manipulator
@ -52,7 +52,7 @@
#include "ED_manipulator_library.h"
/* own includes */
#include "manipulator_library_intern.h"
#include "../manipulator_library_intern.h"
static float verts_plane[4][3] = {
{-1, -1, 0},
@ -192,4 +192,4 @@ void ED_manipulatortypes_primitive_3d(void)
WM_manipulatortype_append(MANIPULATOR_WT_primitive_3d);
}
/** \} */ // Primitive Manipulator API
/** \} */