Design Documents ---------------- * https://wiki.blender.org/index.php/Dev:2.8/Source/Layers * https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised User Commit Log --------------- * New Layer and Collection system to replace render layers and viewport layers. * A layer is a set of collections of objects (and their drawing options) required for specific tasks. * A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers. * All Scenes have a master collection that all other collections are children of. * New collection "context" tab (in Properties Editor) * New temporary viewport "collections" panel to control per-collection visibility Missing User Features --------------------- * Collection "Filter" Option to add objects based on their names * Collection Manager operators The existing buttons are placeholders * Collection Manager drawing The editor main region is empty * Collection Override * Per-Collection engine settings This will come as a separate commit, as part of the clay-engine branch Dev Commit Log -------------- * New DNA file (DNA_layer_types.h) with the new structs We are replacing Base by a new extended Base while keeping it backward compatible with some legacy settings (i.e., lay, flag_legacy). Renamed all Base to BaseLegacy to make it clear the areas of code that still need to be converted Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp * Unittesting for main syncronization requirements - read, write, add/copy/remove objects, copy scene, collection link/unlinking, context) * New Editor: Collection Manager Based on patch by Julian Eisel This is extracted from the layer-manager branch. With the following changes: - Renamed references of layer manager to collections manager - I doesn't include the editors/space_collections/ draw and util files - The drawing code itself will be implemented separately by Julian * Base / Object: A little note about them. Original Blender code would try to keep them in sync through the code, juggling flags back and forth. This will now be handled by Depsgraph, keeping Object and Bases more separated throughout the non-rendering code. Scene.base is being cleared in doversion, and the old viewport drawing code was poorly converted to use the new bases while the new viewport code doesn't get merged and replace the old one. Python API Changes ------------------ ``` - scene.layers + # no longer exists - scene.objects + scene.scene_layers.active.objects - scene.objects.active + scene.render_layers.active.objects.active - bpy.context.scene.objects.link() + bpy.context.scene_collection.objects.link() - bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None) + bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None) - bpy.context.object.select + bpy.context.object.select = True + bpy.context.object.select = False + bpy.context.object.select_get() + bpy.context.object.select_set(action='SELECT') + bpy.context.object.select_set(action='DESELECT') -AddObjectHelper.layers + # no longer exists ```
199 lines
5.8 KiB
C
199 lines
5.8 KiB
C
/*
|
|
* ***** 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.
|
|
*
|
|
* 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.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file ED_transform.h
|
|
* \ingroup editors
|
|
*/
|
|
|
|
#ifndef __ED_TRANSFORM_H__
|
|
#define __ED_TRANSFORM_H__
|
|
|
|
/* ******************* Registration Function ********************** */
|
|
|
|
struct ARegion;
|
|
struct ListBase;
|
|
struct Object;
|
|
struct View3D;
|
|
struct bContext;
|
|
struct wmEvent;
|
|
struct wmKeyConfig;
|
|
struct wmKeyMap;
|
|
struct wmOperatorType;
|
|
struct Main;
|
|
struct SnapObjectContext;
|
|
struct SnapObjectParams;
|
|
|
|
void transform_keymap_for_space(struct wmKeyConfig *keyconf, struct wmKeyMap *keymap, int spaceid);
|
|
void transform_operatortypes(void);
|
|
|
|
/* ******************** Macros & Prototypes *********************** */
|
|
|
|
/* MODE AND NUMINPUT FLAGS */
|
|
enum TfmMode {
|
|
TFM_INIT = -1,
|
|
TFM_DUMMY,
|
|
TFM_TRANSLATION,
|
|
TFM_ROTATION,
|
|
TFM_RESIZE,
|
|
TFM_SKIN_RESIZE,
|
|
TFM_TOSPHERE,
|
|
TFM_SHEAR,
|
|
TFM_BEND,
|
|
TFM_SHRINKFATTEN,
|
|
TFM_TILT,
|
|
TFM_TRACKBALL,
|
|
TFM_PUSHPULL,
|
|
TFM_CREASE,
|
|
TFM_MIRROR,
|
|
TFM_BONESIZE,
|
|
TFM_BONE_ENVELOPE,
|
|
TFM_CURVE_SHRINKFATTEN,
|
|
TFM_MASK_SHRINKFATTEN,
|
|
TFM_GPENCIL_SHRINKFATTEN,
|
|
TFM_BONE_ROLL,
|
|
TFM_TIME_TRANSLATE,
|
|
TFM_TIME_SLIDE,
|
|
TFM_TIME_SCALE,
|
|
TFM_TIME_EXTEND,
|
|
TFM_TIME_DUPLICATE,
|
|
TFM_BAKE_TIME,
|
|
TFM_DEPRECATED, /* was BEVEL */
|
|
TFM_BWEIGHT,
|
|
TFM_ALIGN,
|
|
TFM_EDGE_SLIDE,
|
|
TFM_VERT_SLIDE,
|
|
TFM_SEQ_SLIDE,
|
|
TFM_BONE_ENVELOPE_DIST,
|
|
};
|
|
|
|
/* TRANSFORM CONTEXTS */
|
|
#define CTX_NONE 0
|
|
#define CTX_TEXTURE (1 << 0)
|
|
#define CTX_EDGE (1 << 1)
|
|
#define CTX_NO_PET (1 << 2)
|
|
#define CTX_NO_MIRROR (1 << 3)
|
|
#define CTX_AUTOCONFIRM (1 << 4)
|
|
#define CTX_MOVIECLIP (1 << 6)
|
|
#define CTX_MASK (1 << 7)
|
|
#define CTX_PAINT_CURVE (1 << 8)
|
|
#define CTX_GPENCIL_STROKES (1 << 9)
|
|
|
|
/* Standalone call to get the transformation center corresponding to the current situation
|
|
* returns 1 if successful, 0 otherwise (usually means there's no selection)
|
|
* (if 0 is returns, *vec is unmodified)
|
|
* */
|
|
bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]);
|
|
|
|
struct TransInfo;
|
|
struct BaseLegacy;
|
|
struct Scene;
|
|
struct Object;
|
|
struct wmOperator;
|
|
|
|
/* UNUSED */
|
|
// int BIF_snappingSupported(struct Object *obedit);
|
|
|
|
struct TransformOrientation;
|
|
struct bContext;
|
|
struct ReportList;
|
|
|
|
void BIF_clearTransformOrientation(struct bContext *C);
|
|
void BIF_removeTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
|
|
void BIF_removeTransformOrientationIndex(struct bContext *C, int index);
|
|
void BIF_createTransformOrientation(struct bContext *C, struct ReportList *reports,
|
|
const char *name, const bool use_view,
|
|
const bool activate, const bool overwrite);
|
|
void BIF_selectTransformOrientation(struct bContext *C, struct TransformOrientation *ts);
|
|
void BIF_selectTransformOrientationValue(struct bContext *C, int orientation);
|
|
|
|
void ED_getTransformOrientationMatrix(const struct bContext *C, float orientation_mat[3][3], const short around);
|
|
|
|
int BIF_countTransformOrientation(const struct bContext *C);
|
|
|
|
/* to be able to add operator properties to other operators */
|
|
|
|
#define P_MIRROR (1 << 0)
|
|
#define P_MIRROR_DUMMY (P_MIRROR | (1 << 9))
|
|
#define P_PROPORTIONAL (1 << 1)
|
|
#define P_AXIS (1 << 2)
|
|
#define P_SNAP (1 << 3)
|
|
#define P_GEO_SNAP (P_SNAP | (1 << 4))
|
|
#define P_ALIGN_SNAP (P_GEO_SNAP | (1 << 5))
|
|
#define P_CONSTRAINT (1 << 6)
|
|
#define P_OPTIONS (1 << 7)
|
|
#define P_CORRECT_UV (1 << 8)
|
|
#define P_NO_DEFAULTS (1 << 10)
|
|
#define P_NO_TEXSPACE (1 << 11)
|
|
#define P_GPENCIL_EDIT (1 << 12)
|
|
|
|
void Transform_Properties(struct wmOperatorType *ot, int flags);
|
|
|
|
/* view3d manipulators */
|
|
|
|
int BIF_do_manipulator(struct bContext *C, const struct wmEvent *event, struct wmOperator *op);
|
|
void BIF_draw_manipulator(const struct bContext *C);
|
|
|
|
/* Snapping */
|
|
|
|
typedef enum SnapSelect {
|
|
SNAP_ALL = 0,
|
|
SNAP_NOT_SELECTED = 1,
|
|
SNAP_NOT_ACTIVE = 2,
|
|
} SnapSelect;
|
|
|
|
#define SNAP_MIN_DISTANCE 30
|
|
|
|
bool peelObjectsTransform(
|
|
struct TransInfo *t,
|
|
const float mval[2],
|
|
const bool use_peel_object,
|
|
/* return args */
|
|
float r_loc[3], float r_no[3], float *r_thickness);
|
|
bool peelObjectsSnapContext(
|
|
struct SnapObjectContext *sctx,
|
|
const float mval[2],
|
|
const struct SnapObjectParams *params,
|
|
const bool use_peel_object,
|
|
/* return args */
|
|
float r_loc[3], float r_no[3], float *r_thickness);
|
|
|
|
bool snapObjectsTransform(
|
|
struct TransInfo *t, const float mval[2],
|
|
float *dist_px,
|
|
/* return args */
|
|
float r_loc[3], float r_no[3]);
|
|
bool snapNodesTransform(
|
|
struct TransInfo *t, const int mval[2], SnapSelect snap_select,
|
|
/* return args */
|
|
float r_loc[2], float *r_dist_px, char *r_node_border);
|
|
bool snapNodesContext(
|
|
struct bContext *C, const int mval[2], SnapSelect snap_select,
|
|
/* return args */
|
|
float r_loc[2], float *r_dist_px, char *r_node_border);
|
|
|
|
#endif /* __ED_TRANSFORM_H__ */
|