diff options
Diffstat (limited to 'source/blender/makesdna/DNA_freestyle_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_freestyle_types.h | 90 |
1 files changed, 42 insertions, 48 deletions
diff --git a/source/blender/makesdna/DNA_freestyle_types.h b/source/blender/makesdna/DNA_freestyle_types.h index 505fe474e8b..b5fe7ead936 100644 --- a/source/blender/makesdna/DNA_freestyle_types.h +++ b/source/blender/makesdna/DNA_freestyle_types.h @@ -1,13 +1,10 @@ -/* DNA_freestyle_types.h - * - * $Id$ - * +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * 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. + * 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 @@ -28,52 +25,52 @@ * ***** END GPL LICENSE BLOCK ***** */ -#ifndef DNA_FREESTYLE_TYPES_H -#define DNA_FREESTYLE_TYPES_H +#ifndef __DNA_FREESTYLE_TYPES_H__ +#define __DNA_FREESTYLE_TYPES_H__ #include "DNA_listBase.h" struct FreestyleLineStyle; /* FreestyleConfig::flags */ -#define FREESTYLE_SUGGESTIVE_CONTOURS_FLAG 1 -#define FREESTYLE_RIDGES_AND_VALLEYS_FLAG 2 -#define FREESTYLE_MATERIAL_BOUNDARIES_FLAG 4 -#define FREESTYLE_FACE_SMOOTHNESS_FLAG 8 -#define FREESTYLE_ADVANCED_OPTIONS_FLAG 16 -#define FREESTYLE_CULLING 32 +#define FREESTYLE_SUGGESTIVE_CONTOURS_FLAG (1 << 0) +#define FREESTYLE_RIDGES_AND_VALLEYS_FLAG (1 << 1) +#define FREESTYLE_MATERIAL_BOUNDARIES_FLAG (1 << 2) +#define FREESTYLE_FACE_SMOOTHNESS_FLAG (1 << 3) +#define FREESTYLE_ADVANCED_OPTIONS_FLAG (1 << 4) +#define FREESTYLE_CULLING (1 << 5) /* FreestyleConfig::mode */ #define FREESTYLE_CONTROL_SCRIPT_MODE 1 #define FREESTYLE_CONTROL_EDITOR_MODE 2 /* FreestyleLineSet::flags */ -#define FREESTYLE_LINESET_CURRENT 1l -#define FREESTYLE_LINESET_ENABLED 2 -#define FREESTYLE_LINESET_FE_NOT 4 -#define FREESTYLE_LINESET_FE_AND 8 -#define FREESTYLE_LINESET_GR_NOT 16 -#define FREESTYLE_LINESET_FM_NOT 32 -#define FREESTYLE_LINESET_FM_BOTH 64 +#define FREESTYLE_LINESET_CURRENT (1 << 0) +#define FREESTYLE_LINESET_ENABLED (1 << 1) +#define FREESTYLE_LINESET_FE_NOT (1 << 2) +#define FREESTYLE_LINESET_FE_AND (1 << 3) +#define FREESTYLE_LINESET_GR_NOT (1 << 4) +#define FREESTYLE_LINESET_FM_NOT (1 << 5) +#define FREESTYLE_LINESET_FM_BOTH (1 << 6) /* FreestyleLineSet::selection */ -#define FREESTYLE_SEL_VISIBILITY 1 -#define FREESTYLE_SEL_EDGE_TYPES 2 -#define FREESTYLE_SEL_GROUP 4 -#define FREESTYLE_SEL_IMAGE_BORDER 8 -#define FREESTYLE_SEL_FACE_MARK 16 +#define FREESTYLE_SEL_VISIBILITY (1 << 0) +#define FREESTYLE_SEL_EDGE_TYPES (1 << 1) +#define FREESTYLE_SEL_GROUP (1 << 2) +#define FREESTYLE_SEL_IMAGE_BORDER (1 << 3) +#define FREESTYLE_SEL_FACE_MARK (1 << 4) /* FreestyleLineSet::edge_types, exclude_edge_types */ -#define FREESTYLE_FE_SILHOUETTE 1 -#define FREESTYLE_FE_BORDER 2 -#define FREESTYLE_FE_CREASE 4 -#define FREESTYLE_FE_RIDGE_VALLEY 8 -/* Note: FREESTYLE_FE_VALLEY = 16 is no longer used */ -#define FREESTYLE_FE_SUGGESTIVE_CONTOUR 32 -#define FREESTYLE_FE_MATERIAL_BOUNDARY 64 -#define FREESTYLE_FE_CONTOUR 128 -#define FREESTYLE_FE_EXTERNAL_CONTOUR 512 -#define FREESTYLE_FE_EDGE_MARK 1024 +#define FREESTYLE_FE_SILHOUETTE (1 << 0) +#define FREESTYLE_FE_BORDER (1 << 1) +#define FREESTYLE_FE_CREASE (1 << 2) +#define FREESTYLE_FE_RIDGE_VALLEY (1 << 3) +/* Note: FREESTYLE_FE_VALLEY = (1 << 4) is no longer used */ +#define FREESTYLE_FE_SUGGESTIVE_CONTOUR (1 << 5) +#define FREESTYLE_FE_MATERIAL_BOUNDARY (1 << 6) +#define FREESTYLE_FE_CONTOUR (1 << 7) +#define FREESTYLE_FE_EXTERNAL_CONTOUR (1 << 8) +#define FREESTYLE_FE_EDGE_MARK (1 << 9) /* FreestyleLineSet::qi */ #define FREESTYLE_QI_VISIBLE 1 @@ -81,14 +78,14 @@ struct FreestyleLineStyle; #define FREESTYLE_QI_RANGE 3 /* FreestyleConfig::raycasting_algorithm */ -// Defines should be replaced with ViewMapBuilder::visibility_algo -#define FREESTYLE_ALGO_REGULAR 1 -#define FREESTYLE_ALGO_FAST 2 -#define FREESTYLE_ALGO_VERYFAST 3 -#define FREESTYLE_ALGO_CULLED_ADAPTIVE_TRADITIONAL 4 -#define FREESTYLE_ALGO_ADAPTIVE_TRADITIONAL 5 -#define FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE 6 -#define FREESTYLE_ALGO_ADAPTIVE_CUMULATIVE 7 +/* Defines should be replaced with ViewMapBuilder::visibility_algo */ +#define FREESTYLE_ALGO_REGULAR 1 +#define FREESTYLE_ALGO_FAST 2 +#define FREESTYLE_ALGO_VERYFAST 3 +#define FREESTYLE_ALGO_CULLED_ADAPTIVE_TRADITIONAL 4 +#define FREESTYLE_ALGO_ADAPTIVE_TRADITIONAL 5 +#define FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE 6 +#define FREESTYLE_ALGO_ADAPTIVE_CUMULATIVE 7 typedef struct FreestyleLineSet { struct FreestyleLineSet *next, *prev; @@ -105,21 +102,19 @@ typedef struct FreestyleLineSet { struct Group *group; /* group of target objects */ struct FreestyleLineStyle *linestyle; - } FreestyleLineSet; typedef struct FreestyleModuleConfig { struct FreestyleModuleConfig *next, *prev; - + char module_path[256]; short is_displayed; short pad[3]; - } FreestyleModuleConfig; typedef struct FreestyleConfig { ListBase modules; - + int mode; /* scripting, editor */ int raycasting_algorithm; /* XXX deprecated */ int flags; /* suggestive contours, ridges/valleys, material boundaries */ @@ -128,7 +123,6 @@ typedef struct FreestyleConfig { float crease_angle; /* in radians! */ ListBase linesets; - } FreestyleConfig; #endif |