diff options
Diffstat (limited to 'source/blender/editors/space_collections')
4 files changed, 0 insertions, 602 deletions
diff --git a/source/blender/editors/space_collections/CMakeLists.txt b/source/blender/editors/space_collections/CMakeLists.txt deleted file mode 100644 index 1cc4a40d657..00000000000 --- a/source/blender/editors/space_collections/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -# ***** 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. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -set(INC - ../include - ../../blenkernel - ../../blenlib - ../../blentranslation - ../../gpu - ../../makesdna - ../../makesrna - ../../windowmanager - ../../../../intern/guardedalloc - ../../../../intern/glew-mx -) - -set(INC_SYS - ${GLEW_INCLUDE_PATH} -) - -set(SRC - collections_ops.c - space_collections.c - - collections_intern.h -) - -blender_add_lib(bf_editor_space_collections "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_collections/collections_intern.h b/source/blender/editors/space_collections/collections_intern.h deleted file mode 100644 index 866f59659c3..00000000000 --- a/source/blender/editors/space_collections/collections_intern.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * ***** 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. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/editors/space_collections/collections_intern.h - * \ingroup spcollections - */ - -#ifndef __COLLECTIONS_INTERN_H__ -#define __COLLECTIONS_INTERN_H__ - -struct wmKeyConfig; - -/* collections_ops.c */ -void collections_operatortypes(void); -void collections_keymap(struct wmKeyConfig *keyconf); - -#endif /* __COLLECTIONS_INTERN_H__ */ - diff --git a/source/blender/editors/space_collections/collections_ops.c b/source/blender/editors/space_collections/collections_ops.c deleted file mode 100644 index 7e1bf8091b0..00000000000 --- a/source/blender/editors/space_collections/collections_ops.c +++ /dev/null @@ -1,340 +0,0 @@ -/* - * ***** 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. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/editors/space_collections/collections_ops.c - * \ingroup spcollections - */ - -#include "BKE_context.h" -#include "BKE_layer.h" -#include "BKE_report.h" - -#include "ED_screen.h" - -#include "WM_api.h" -#include "WM_types.h" - -#include "RNA_access.h" -#include "RNA_define.h" - -#include "collections_intern.h" /* own include */ - -/* -------------------------------------------------------------------- */ -/* polls */ - -static SceneCollection *collection_manager_collection_active(bContext *C) -{ - TODO_LAYER_OPERATORS; - /* consider that we may have overrides active - * leading to no active collections */ - return CTX_data_scene_collection(C); -} - -static int operator_not_master_collection_active(bContext *C) -{ - SceneCollection *sc = collection_manager_collection_active(C); - if (sc == NULL) { - return 1; - } - - return (sc == BKE_collection_master(CTX_data_scene(C))) ? 0 : 1; -} - -static int operator_top_collection_active(bContext *C) -{ - SceneCollection *sc = collection_manager_collection_active(C); - if (sc == NULL) { - return 0; - } - - TODO_LAYER_OPERATORS; - /* see if it's a top collection */ - return 1; -} - -static int operator_collection_active(bContext *C) -{ - return collection_manager_collection_active(C) ? 1 : 0; -} - -/* -------------------------------------------------------------------- */ -/* collection manager operators */ - -static int collection_link_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event)) -{ - TODO_LAYER_OPERATORS; - BKE_report(op->reports, RPT_ERROR, "COLLECTIONS_OT_collection_link not implemented yet"); - return OPERATOR_CANCELLED; -} - -static void COLLECTIONS_OT_collection_link(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Add Collection"; - ot->idname = "COLLECTIONS_OT_collection_link"; - ot->description = "Link a new collection to the active layer"; - - /* api callbacks */ - ot->invoke = collection_link_invoke; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static int collection_unlink_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event)) -{ - TODO_LAYER_OPERATORS; - BKE_report(op->reports, RPT_ERROR, "COLLECTIONS_OT_collection_unlink not implemented yet"); - return OPERATOR_CANCELLED; -} - -static void COLLECTIONS_OT_collection_unlink(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Add Collection"; - ot->idname = "COLLECTIONS_OT_collection_unlink"; - ot->description = "Link a new collection to the active layer"; - - /* api callbacks */ - ot->invoke = collection_unlink_invoke; - ot->poll = operator_top_collection_active; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static int collection_new_exec(bContext *C, wmOperator *UNUSED(op)) -{ - Scene *scene = CTX_data_scene(C); - SceneLayer *sl = CTX_data_scene_layer(C); - - SceneCollection *sc = BKE_collection_add(scene, NULL, NULL); - BKE_collection_link(sl, sc); - - WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); - return OPERATOR_FINISHED; -} - -static void COLLECTIONS_OT_collection_new(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "New Collection"; - ot->idname = "COLLECTIONS_OT_collection_new"; - ot->description = "Add a new collection to the scene, and link it to the active layer"; - - /* api callbacks */ - ot->exec = collection_new_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static int override_new_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event)) -{ - TODO_LAYER_OPERATORS; - TODO_LAYER_OVERRIDE; - BKE_report(op->reports, RPT_ERROR, "COLLECTIONS_OT_override_new not implemented yet"); - return OPERATOR_CANCELLED; -} - -static void COLLECTIONS_OT_override_new(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "New Override"; - ot->idname = "COLLECTIONS_OT_override_new"; - ot->description = "Add a new override to the active collection"; - - /* api callbacks */ - ot->invoke = override_new_invoke; - ot->poll = operator_collection_active; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static int delete_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event)) -{ - TODO_LAYER_OPERATORS; - BKE_report(op->reports, RPT_ERROR, "COLLECTIONS_OT_delete not implemented yet"); - return OPERATOR_CANCELLED; -} - -static void COLLECTIONS_OT_delete(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Delete"; - ot->idname = "COLLECTIONS_OT_delete"; - ot->description = "Delete active override or collection"; - - /* api callbacks */ - ot->invoke = delete_invoke; - ot->poll = operator_not_master_collection_active; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static int select_exec(bContext *C, wmOperator *op) -{ - SceneLayer *sl = CTX_data_scene_layer(C); - const int collection_index = RNA_int_get(op->ptr, "collection_index"); - sl->active_collection = collection_index; - WM_main_add_notifier(NC_SCENE | ND_LAYER, NULL); - return OPERATOR_FINISHED; -} - -static void COLLECTIONS_OT_select(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Select"; - ot->idname = "COLLECTIONS_OT_select"; - ot->description = "Change active collection or override"; - - /* api callbacks */ - ot->exec = select_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - RNA_def_int(ot->srna, "collection_index", 0, 0, INT_MAX, "Index", - "Index of collection to select", 0, INT_MAX); -} - -static int rename_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event)) -{ - TODO_LAYER_OPERATORS; - BKE_report(op->reports, RPT_ERROR, "COLLECTIONS_rename not implemented yet"); - return OPERATOR_CANCELLED; -} - -static void COLLECTIONS_OT_rename(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Rename"; - ot->idname = "COLLECTIONS_OT_rename"; - ot->description = "Rename active collection or override"; - - /* api callbacks */ - ot->invoke = rename_invoke; - ot->poll = operator_not_master_collection_active; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -/* -------------------------------------------------------------------- */ -/* property editor operators */ - -static int stubs_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event)) -{ - TODO_LAYER_OPERATORS; - BKE_report(op->reports, RPT_ERROR, "Operator not implemented yet"); - return OPERATOR_CANCELLED; -} - -static void COLLECTIONS_OT_objects_add(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Add Objects"; - ot->idname = "COLLECTIONS_OT_objects_add"; - ot->description = "Add selected objects to collection"; - - /* api callbacks */ - ot->invoke = stubs_invoke; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static void COLLECTIONS_OT_objects_remove(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Remove Object"; - ot->idname = "COLLECTIONS_OT_objects_remove"; - ot->description = "Remove object from collection"; - - /* api callbacks */ - ot->invoke = stubs_invoke; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static void COLLECTIONS_OT_objects_select(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Select Objects"; - ot->idname = "COLLECTIONS_OT_objects_select"; - ot->description = "Selected collection objects"; - - /* api callbacks */ - ot->invoke = stubs_invoke; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -static void COLLECTIONS_OT_objects_deselect(wmOperatorType *ot) -{ - /* identifiers */ - ot->name = "Deselect Objects"; - ot->idname = "COLLECTIONS_OT_objects_deselect"; - ot->description = "Deselected collection objects"; - - /* api callbacks */ - ot->invoke = stubs_invoke; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; -} - -/* ************************** registration - operator types **********************************/ - -void collections_operatortypes(void) -{ - WM_operatortype_append(COLLECTIONS_OT_delete); - WM_operatortype_append(COLLECTIONS_OT_select); - WM_operatortype_append(COLLECTIONS_OT_rename); - WM_operatortype_append(COLLECTIONS_OT_collection_link); - WM_operatortype_append(COLLECTIONS_OT_collection_unlink); - WM_operatortype_append(COLLECTIONS_OT_collection_new); - WM_operatortype_append(COLLECTIONS_OT_override_new); - - WM_operatortype_append(COLLECTIONS_OT_objects_add); - WM_operatortype_append(COLLECTIONS_OT_objects_remove); - WM_operatortype_append(COLLECTIONS_OT_objects_select); - WM_operatortype_append(COLLECTIONS_OT_objects_deselect); -} - -void collections_keymap(wmKeyConfig *keyconf) -{ - wmKeyMap *keymap = WM_keymap_find(keyconf, "Collections Manager", SPACE_COLLECTIONS, 0); - - /* selection */ - WM_keymap_add_item(keymap, "COLLECTIONS_OT_select", LEFTMOUSE, KM_CLICK, 0, 0); - - WM_keymap_add_item(keymap, "COLLECTIONS_OT_rename", LEFTMOUSE, KM_DBL_CLICK, 0, 0); - WM_keymap_add_item(keymap, "COLLECTIONS_OT_rename", LEFTMOUSE, KM_PRESS, KM_CTRL, 0); - - WM_keymap_add_item(keymap, "COLLECTIONS_OT_collection_new", NKEY, KM_PRESS, KM_CTRL, 0); - - WM_keymap_add_item(keymap, "COLLECTIONS_OT_delete", XKEY, KM_PRESS, 0, 0); - WM_keymap_add_item(keymap, "COLLECTIONS_OT_delete", DELKEY, KM_PRESS, 0, 0); -} diff --git a/source/blender/editors/space_collections/space_collections.c b/source/blender/editors/space_collections/space_collections.c deleted file mode 100644 index 7dd50e5cbac..00000000000 --- a/source/blender/editors/space_collections/space_collections.c +++ /dev/null @@ -1,182 +0,0 @@ -/* - * ***** 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. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -/** \file blender/editors/space_collections/space_collections.c - * \ingroup spcollections - */ - -#include <string.h> - -#include "MEM_guardedalloc.h" - -#include "BIF_gl.h" - -#include "BKE_context.h" -#include "BKE_screen.h" - -#include "BLI_ghash.h" -#include "BLI_listbase.h" - -#include "ED_screen.h" -#include "ED_space_api.h" - -#include "UI_resources.h" -#include "UI_view2d.h" - -#include "WM_api.h" -#include "WM_types.h" - -#include "collections_intern.h" /* own include */ - -/* ******************** default callbacks for collection manager space ***************** */ - -static SpaceLink *collections_new(const bContext *UNUSED(C)) -{ - ARegion *ar; - SpaceCollections *scollection; /* hmm, that's actually a good band name... */ - - scollection = MEM_callocN(sizeof(SpaceCollections), __func__); - scollection->spacetype = SPACE_COLLECTIONS; - - /* header */ - ar = MEM_callocN(sizeof(ARegion), "header for collection manager"); - BLI_addtail(&scollection->regionbase, ar); - ar->regiontype = RGN_TYPE_HEADER; - ar->alignment = RGN_ALIGN_BOTTOM; - - /* main region */ - ar = MEM_callocN(sizeof(ARegion), "main region for collection manager"); - BLI_addtail(&scollection->regionbase, ar); - ar->regiontype = RGN_TYPE_WINDOW; - ar->v2d.scroll = (V2D_SCROLL_RIGHT | V2D_SCROLL_BOTTOM | V2D_SCROLL_HORIZONTAL_HIDE | V2D_SCROLL_VERTICAL_HIDE); - ar->v2d.align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y); - - return (SpaceLink *)scollection; -} - -static void collections_free(SpaceLink *UNUSED(sl)) -{ -} - -static SpaceLink *collections_duplicate(SpaceLink *sl) -{ - SpaceCollections *scollection = MEM_dupallocN(sl); - - /* clear or remove stuff from old */ - - return (SpaceLink *)scollection; -} - -/* add handlers, stuff you only do once or on area/region changes */ -static void collection_main_region_init(wmWindowManager *wm, ARegion *ar) -{ - UI_view2d_region_reinit(&ar->v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy); - ar->v2d.scroll |= (V2D_SCROLL_VERTICAL_FULLR | V2D_SCROLL_HORIZONTAL_FULLR); - - /* own keymap */ - wmKeyMap *keymap = WM_keymap_find(wm->defaultconf, "Layer Manager", SPACE_COLLECTIONS, 0); - WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); -} - -static void collections_main_region_draw(const bContext *C, ARegion *ar) -{ - SpaceCollections *spc = CTX_wm_space_collections(C); - View2D *v2d = &ar->v2d; - - if (spc->flag & SC_COLLECTION_DATA_REFRESH) { - } - - /* v2d has initialized flag, so this call will only set the mask correct */ - UI_view2d_region_reinit(v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy); - - UI_ThemeClearColor(TH_BACK); - glClear(GL_COLOR_BUFFER_BIT); - - /* reset view matrix */ - UI_view2d_view_restore(C); - - /* scrollers */ - View2DScrollers *scrollers; - scrollers = UI_view2d_scrollers_calc(C, v2d, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY, V2D_ARG_DUMMY); - UI_view2d_scrollers_draw(C, v2d, scrollers); - UI_view2d_scrollers_free(scrollers); -} - -/* add handlers, stuff you only do once or on area/region changes */ -static void collections_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) -{ - ED_region_header_init(ar); -} - -static void collections_header_region_draw(const bContext *C, ARegion *ar) -{ - ED_region_header(C, ar); -} - -static void collections_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn) -{ - switch (wmn->category) { - case NC_SCENE: - if (wmn->data == ND_LAYER) { - ED_region_tag_redraw(ar); - } - break; - case NC_SPACE: - if (wmn->data == ND_SPACE_COLLECTIONS) { - ED_region_tag_redraw(ar); - } - } -} - -/* only called once, from space/spacetypes.c */ -void ED_spacetype_collections(void) -{ - SpaceType *st = MEM_callocN(sizeof(SpaceType), "spacetype collections"); - ARegionType *art; - - st->spaceid = SPACE_COLLECTIONS; - strncpy(st->name, "LayerManager", BKE_ST_MAXNAME); - - st->new = collections_new; - st->free = collections_free; - st->duplicate = collections_duplicate; - st->operatortypes = collections_operatortypes; - st->keymap = collections_keymap; - - /* regions: main window */ - art = MEM_callocN(sizeof(ARegionType), "spacetype collections region"); - art->regionid = RGN_TYPE_WINDOW; - art->init = collection_main_region_init; - art->draw = collections_main_region_draw; - art->listener = collections_main_region_listener; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D; - BLI_addhead(&st->regiontypes, art); - - /* regions: header */ - art = MEM_callocN(sizeof(ARegionType), "spacetype collections header"); - art->regionid = RGN_TYPE_HEADER; - art->prefsizey = HEADERY; - art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_HEADER; - art->init = collections_header_region_init; - art->draw = collections_header_region_draw; - BLI_addhead(&st->regiontypes, art); - - BKE_spacetype_register(st); -} |