[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50094] branches/asset-browser/source/ blender/editors/space_asset: == assetbrowser ==

Andrea Weikert elubie at gmx.net
Tue Aug 21 19:47:01 CEST 2012


Revision: 50094
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50094
Author:   elubie
Date:     2012-08-21 17:47:00 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
== assetbrowser ==
WIP commit
* fix: added missing files, sigh
* added icons (no previews yet though)

Added Paths:
-----------
    branches/asset-browser/source/blender/editors/space_asset/assetlist.c
    branches/asset-browser/source/blender/editors/space_asset/assetlist.h

Added: branches/asset-browser/source/blender/editors/space_asset/assetlist.c
===================================================================
--- branches/asset-browser/source/blender/editors/space_asset/assetlist.c	                        (rev 0)
+++ branches/asset-browser/source/blender/editors/space_asset/assetlist.c	2012-08-21 17:47:00 UTC (rev 50094)
@@ -0,0 +1,482 @@
+/*
+ * ***** 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) 2012 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Andrea Weikert.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/space_file/assetlist.c
+ *  \ingroup spfile
+ */
+
+
+/* global includes */
+#include "MEM_guardedalloc.h"
+#include "MEM_sys_types.h"
+
+#include "BKE_main.h"
+#include "BKE_global.h"
+#include "BKE_utildefines.h"
+#include "BKE_assets.h"
+#include "BKE_context.h"
+#include "BKE_idcode.h"
+
+#include "BLI_listbase.h"
+#include "BLI_string.h"
+#include "BLI_utildefines.h"
+#include "BLI_path_util.h" /* for testing extension */
+
+#include "BLF_api.h"
+
+#include "BLO_readfile.h"
+
+#include "DNA_space_types.h"
+#include "DNA_asset_types.h"
+
+#include "IMB_imbuf_types.h"
+#include "IMB_imbuf.h"
+
+#include "UI_resources.h"
+
+#include "contentlist.h"
+#include "contentlist_intern.h"
+
+#include <string.h>
+
+
+/* -------------- SORTING -------------------*/
+static int compare_helper(const void *a1, const void *a2)
+{
+	const bAsset *entry1 = a1, *entry2 = a2;
+	
+	/* make sure "." and ".." are always first */
+	if (strcmp(entry1->name, ".") == 0) return (-1);
+	if (strcmp(entry2->name, ".") == 0) return (1);
+	if (strcmp(entry1->name, "..") == 0) return (-1);
+	if (strcmp(entry2->name, "..") == 0) return (1);
+
+	return 0;
+}
+
+static int compare_name(const void *a1, const void *a2)
+{
+	const ContentListEntry *le1 = a1, *le2 = a2;
+	const bAsset *entry1 = le1->data, *entry2 = le2->data;
+	
+	int pre_compare = compare_helper(entry1, entry2);
+
+	if (pre_compare != 0) {
+		return pre_compare;
+	}
+	
+	return (BLI_natstrcmp(entry1->name, entry2->name));
+}
+
+
+
+/* ----------- FILTERING ------------------- */
+static int assetlist_filter_dot(struct ContentListFilter *filter, struct ContentListEntry *le)
+{
+	int is_hidden = FALSE;
+	const bAsset *asset = le->data;
+
+	if (((asset->name[0] == '.') && (asset->name[1] != '.') && (asset->name[1] != 0) )) {
+		is_hidden = TRUE; /* ignore .blah */
+	}
+	return is_hidden;
+}
+
+static int assetlist_filter_dot_refresh(struct ContentListFilter *filter, struct ContentListEntry *le)
+{
+	int is_hidden = FALSE;
+	const bAsset *asset = le->data;
+
+	if (((asset->name[0] == '.') && (asset->name[1] == 0) )) {
+		is_hidden = TRUE; /* ignore . */
+	}
+	return is_hidden;
+}
+
+static int assetlist_filter_temp(struct ContentListFilter *filter, struct ContentListEntry *le)
+{
+	int is_hidden = FALSE;
+	const bAsset *asset = le->data;
+
+	int len = strlen(asset->name);
+	if ( (len > 0) && (asset->name[len - 1] == '~') ) {
+		is_hidden = TRUE;  /* ignore file~ */
+	}
+
+	return is_hidden;
+}
+
+static int assetlist_filter_flags(struct ContentListFilter *filter, struct ContentListEntry *le)
+{
+	int setting = filter->data.setting;
+	const bAsset *asset = le->data;
+	int show = FALSE;
+
+	show = (( setting & ASC_SCHOWFLAG_ACTION ) && (BKE_idcode_from_name(asset->group) == ID_AC));
+	show |= ((setting & ASC_SCHOWFLAG_ARMATURE) && (BKE_idcode_from_name(asset->group) == ID_AR));
+	show |= ((setting & ASC_SCHOWFLAG_BRUSH) && (BKE_idcode_from_name(asset->group) == ID_BR));
+	show |= ((setting & ASC_SCHOWFLAG_CAMERA) && (BKE_idcode_from_name(asset->group) == ID_CA));
+	show |= ((setting & ASC_SCHOWFLAG_CURVE) && (BKE_idcode_from_name(asset->group) == ID_CU));
+	show |= ((setting & ASC_SCHOWFLAG_GPENCIL) && (BKE_idcode_from_name(asset->group) == ID_GD));
+	show |= ((setting & ASC_SCHOWFLAG_GROUP) && (BKE_idcode_from_name(asset->group) == ID_GR));
+	show |= ((setting & ASC_SCHOWFLAG_IMAGE) && (BKE_idcode_from_name(asset->group) == ID_IM));
+	show |= ((setting & ASC_SCHOWFLAG_LAMP) && (BKE_idcode_from_name(asset->group) == ID_LA));
+	show |= ((setting & ASC_SCHOWFLAG_LATTICE) && (BKE_idcode_from_name(asset->group) == ID_LT));
+	show |= ((setting & ASC_SCHOWFLAG_MATERIAL) && (BKE_idcode_from_name(asset->group) == ID_MA));
+	show |= ((setting & ASC_SCHOWFLAG_METABALL) && (BKE_idcode_from_name(asset->group) == ID_MB));
+	show |= ((setting & ASC_SCHOWFLAG_MESH) && (BKE_idcode_from_name(asset->group) == ID_ME));
+	show |= ((setting & ASC_SCHOWFLAG_NODETREE) && (BKE_idcode_from_name(asset->group) == ID_NT));
+	show |= ((setting & ASC_SCHOWFLAG_OBJECT) && (BKE_idcode_from_name(asset->group) == ID_OB));
+	show |= ((setting & ASC_SCHOWFLAG_SCENE) && (BKE_idcode_from_name(asset->group) == ID_SCE));
+	show |= ((setting & ASC_SCHOWFLAG_SPEAKER) && (BKE_idcode_from_name(asset->group) == ID_SPK));
+	show |= ((setting & ASC_SCHOWFLAG_SOUND) && (BKE_idcode_from_name(asset->group) == ID_SO));
+	show |= ((setting & ASC_SCHOWFLAG_TEXTURE) && (BKE_idcode_from_name(asset->group) == ID_TE));
+	show |= ((setting & ASC_SCHOWFLAG_TEXT) && (BKE_idcode_from_name(asset->group) == ID_TXT));
+	show |= ((setting & ASC_SCHOWFLAG_VFONT) && (BKE_idcode_from_name(asset->group) == ID_VF));
+	show |= ((setting & ASC_SCHOWFLAG_WORLD) && (BKE_idcode_from_name(asset->group) == ID_WO));
+	show |= ((setting & ASC_SCHOWFLAG_MOVIECLIP) && (BKE_idcode_from_name(asset->group) == ID_MC));
+	show |= ((setting & ASC_SCHOWFLAG_MASK) && (BKE_idcode_from_name(asset->group) == ID_MSK));
+	show |= ((setting & ASC_SCHOWFLAG_ASSETS) && (BKE_idcode_from_name(asset->group) == ID_ASC));
+
+	return !show;
+}
+
+static int assetlist_filter_glob(struct ContentListFilter *filter, struct ContentListEntry *le)
+{
+	const bAsset *asset = le->data;
+	int is_hidden = TRUE;
+
+	if ('\0' != filter->data.string[0])
+	{
+		is_hidden = !BLI_testextensie_glob(asset->name, filter->data.string);
+	}
+	return is_hidden;
+};
+
+/* ----------------------- assetlist ------------------------------ */
+
+enum eFileListColumns { 
+	ASSETLIST_COLUMN_NAME = 0,
+	ASSETLIST_COLUMN_GROUP,
+	ASSETLIST_COLUMN_LIB,
+};
+
+#define ASSETLIST_COLUMN_LAST (ASSETLIST_COLUMN_LIB+1)
+
+
+
+static char * assetlist_entry_get_formatted(struct ContentList *cl, int idx, int col)
+{
+	struct ContentListEntry *le = &cl->entries[idx];
+	bAsset *asset = le->data;
+	switch (col) {
+		case ASSETLIST_COLUMN_NAME:
+			return asset->name;
+		case ASSETLIST_COLUMN_GROUP:
+			return asset->group;
+		case ASSETLIST_COLUMN_LIB:
+			return asset->lib;
+		default:
+			return NULL;
+	};
+}
+
+char *assetlist_entry_get_dragpath(struct ContentList *cl, int idx)
+{
+	ContentListEntry *le = &cl->entries[idx];
+	bAsset *asset = le->data;
+	return asset->path;
+}
+
+static int assetlist_entry_is_dir(struct ContentList* cl, int idx)
+{
+	ContentListEntry *le = &cl->entries[idx];
+	const bAsset *asset = le->data;
+
+	return 0;
+}
+
+static int assetlist_entry_is_regular(struct ContentList* cl, int idx)
+{
+	ContentListEntry *le = &cl->entries[idx];
+	const bAsset *asset = le->data;
+
+	return 1;
+}
+
+static int assetlist_entry_get_icon(struct ContentList* cl, int idx)
+{
+	ContentListEntry *le = &cl->entries[idx];
+	const bAsset *asset = le->data;
+
+	if (BKE_idcode_from_name(asset->group) == ID_AC) {
+		return ICON_ANIM_DATA;
+	}	
+	else if (BKE_idcode_from_name(asset->group) == ID_AR) {
+		return ICON_ARMATURE_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_BR) {
+		return ICON_BRUSH_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_CA) {
+		return ICON_CAMERA_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_CU) {
+		return ICON_CURVE_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_GD) {
+		return ICON_GREASEPENCIL;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_GR) {
+		return ICON_GROUP;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_IM) {
+		return ICON_IMAGE_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_LA) {
+		return ICON_LAMP_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_LT) {
+		return ICON_LATTICE_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_MA) {
+		return ICON_MATERIAL_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_MB) {
+		return ICON_META_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_ME) {
+		return ICON_MESH_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_NT) {
+		return ICON_NODETREE;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_OB) {
+		return ICON_OBJECT_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_SCE) {
+		return ICON_SCENE_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_SPK) {
+		return ICON_SPEAKER;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_SO) {
+		return ICON_SOUND;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_TE) {
+		return ICON_TEXTURE_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_TXT) {
+		return ICON_TEXT;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_VF) {
+		return ICON_FONT_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_WO) {
+		return ICON_WORLD_DATA;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_MC) {
+		return ICON_CLIP;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_MSK) {
+		return ICON_CLIP;
+	}
+	else if (BKE_idcode_from_name(asset->group) == ID_ASC) {
+		return ICON_ASSET_MANAGER;
+	}
+
+	return ICON_FILE_BLANK;
+}
+
+static void assetlist_free_entries(struct ContentList *cl)
+{
+	int i;
+	for (i = 0; i < cl->num_entries; ++i) {
+		struct ContentListEntry *le = &cl->entries[i];
+		MEM_freeN(le->data);
+		le->data = NULL;
+		if (le->image) {			

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list