diff options
author | Jeroen Bakker <jeroen@blender.org> | 2020-03-06 14:59:09 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2020-03-06 15:00:06 +0300 |
commit | 63bb2007d88b88824094447a745fa21d5fb2f61b (patch) | |
tree | 54af8d34a0b0ab41ddcac69b3d22d00d80305b5d /source/blender/makesdna | |
parent | f0808b53abf2f208da5f20ad33637dc60bcf43d1 (diff) |
CodeCleanup: Added View3DShading enums
Added the core enums that workbench draw engine uses.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_view3d_enums.h | 59 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 36 |
2 files changed, 60 insertions, 35 deletions
diff --git a/source/blender/makesdna/DNA_view3d_enums.h b/source/blender/makesdna/DNA_view3d_enums.h new file mode 100644 index 00000000000..de186700ed1 --- /dev/null +++ b/source/blender/makesdna/DNA_view3d_enums.h @@ -0,0 +1,59 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +/** \file + * \ingroup DNA + */ + +#ifndef __DNA_VIEW3D_ENUMS_H__ +#define __DNA_VIEW3D_ENUMS_H__ + +/** Settings for offscreen rendering */ +typedef enum eV3DOffscreenDrawFlag { + V3D_OFSDRAW_NONE = (0), + V3D_OFSDRAW_SHOW_ANNOTATION = (1 << 0), + V3D_OFSDRAW_OVERRIDE_SCENE_SETTINGS = (1 << 1), +} eV3DOffscreenDrawFlag; + +/** #View3DShading.light */ +typedef enum eV3DShadingLightingMode { + V3D_LIGHTING_FLAT = 0, + V3D_LIGHTING_STUDIO = 1, + V3D_LIGHTING_MATCAP = 2, +} eV3DShadingLightingMode; + +/** #View3DShading.color_type, #View3DShading.wire_color_type */ +typedef enum eV3DShadingColorType { + V3D_SHADING_MATERIAL_COLOR = 0, + V3D_SHADING_RANDOM_COLOR = 1, + V3D_SHADING_SINGLE_COLOR = 2, + V3D_SHADING_TEXTURE_COLOR = 3, + V3D_SHADING_OBJECT_COLOR = 4, + V3D_SHADING_VERTEX_COLOR = 5, + + /* Is used to display the object using the error color. For example when in + * solid texture paint mode without any textures configured */ + V3D_SHADING_ERROR_COLOR = 999, +} eV3DShadingColorType; + +/** #View3DShading.background_type */ +typedef enum eV3DShadingBackgroundType { + V3D_SHADING_BACKGROUND_THEME = 0, + V3D_SHADING_BACKGROUND_WORLD = 1, + V3D_SHADING_BACKGROUND_VIEWPORT = 2, +} eV3DShadingBackgroundType; + +#endif diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index f0743a3fbb9..67ef1b35f9d 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -38,6 +38,7 @@ struct wmTimer; #include "DNA_image_types.h" #include "DNA_object_types.h" #include "DNA_movieclip_types.h" +#include "DNA_view3d_enums.h" typedef struct RegionView3D { @@ -422,13 +423,6 @@ enum { #define V3D_GP_FADE_NOACTIVE_LAYERS (1 << 5) /* fade layers not active */ #define V3D_GP_FADE_NOACTIVE_GPENCIL (1 << 6) /* Fade other GPencil objects */ -/** #View3DShading.light */ -enum { - V3D_LIGHTING_FLAT = 0, - V3D_LIGHTING_STUDIO = 1, - V3D_LIGHTING_MATCAP = 2, -}; - /** #View3DShading.flag */ enum { V3D_SHADING_OBJECT_OUTLINE = (1 << 0), @@ -447,27 +441,6 @@ enum { V3D_SHADING_SCENE_WORLD_RENDER = (1 << 13), }; -/** #View3DShading.color_type */ -enum { - V3D_SHADING_MATERIAL_COLOR = 0, - V3D_SHADING_RANDOM_COLOR = 1, - V3D_SHADING_SINGLE_COLOR = 2, - V3D_SHADING_TEXTURE_COLOR = 3, - V3D_SHADING_OBJECT_COLOR = 4, - V3D_SHADING_VERTEX_COLOR = 5, - - /* Is used to display the object using the error color. For example when in - * solid texture paint mode without any textures configured */ - V3D_SHADING_ERROR_COLOR = 999, -}; - -/** #View3DShading.background_type */ -enum { - V3D_SHADING_BACKGROUND_THEME = 0, - V3D_SHADING_BACKGROUND_WORLD = 1, - V3D_SHADING_BACKGROUND_VIEWPORT = 2, -}; - /** #View3DShading.cavity_type */ enum { V3D_SHADING_CAVITY_SSAO = 0, @@ -607,13 +580,6 @@ enum { V3D_GIZMO_SHOW_CAMERA_DOF_DIST = (1 << 2), }; -/** Settings for offscreen rendering */ -typedef enum eV3DOffscreenDrawFlag { - V3D_OFSDRAW_NONE = (0), - V3D_OFSDRAW_SHOW_ANNOTATION = (1 << 0), - V3D_OFSDRAW_OVERRIDE_SCENE_SETTINGS = (1 << 1), -} eV3DOffscreenDrawFlag; - #define RV3D_CAMZOOM_MIN -30 #define RV3D_CAMZOOM_MAX 600 |