- sillyness... added drawMappedEdges for mesh

 - revert to drawLooseEdges instead of general drawEdgesFlag
 - ditched TFace edge flags, done dynamically now which also
   means don't need to recalc surface on flag changes
 - added BLI_edgehash, guess what it does

3 files changed, 232 insertions, 0 deletions

diff --git a/source/blender/blenlib/BLI_edgehash.h b/source/blender/blenlib/BLI_edgehash.h
new file mode 100644
index 00000000000..33ae8a5d5e2
--- /dev/null
+++ b/source/blender/blenlib/BLI_edgehash.h
@@ -0,0 +1,70 @@
+/**
+ * A general unordered 2-int pair hash table ADT
+ * 
+ * $Id$
+ *
+ * ***** BEGIN GPL/BL DUAL 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. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: none of this file.
+ *
+ * Contributor(s): Daniel Dunbar
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ */
+ 
+#ifndef BLI_EDGEHASH_H
+#define BLI_EDGEHASH_H
+
+struct EdgeHash;
+typedef struct EdgeHash EdgeHash;
+
+typedef	void	(*EdgeHashFreeFP)(void *key);
+
+EdgeHash*		BLI_edgehash_new		(void);
+void			BLI_edgehash_free		(EdgeHash *eh, EdgeHashFreeFP valfreefp);
+
+	/* Insert edge (v0,v1) into hash with given value, does
+	 * not check for duplicates.
+	 */
+void			BLI_edgehash_insert		(EdgeHash *eh, int v0, int v1, void *val);
+
+	/* Return value for given edge (v0,v1), or NULL if
+	 * if key does not exist in hash. (If need exists 
+	 * to differentiate between key-value being NULL and 
+	 * lack of key then see BLI_edgehash_lookup_p().
+	 */
+void*			BLI_edgehash_lookup		(EdgeHash *eh, int v0, int v1);
+
+	/* Return pointer to value for given edge (v0,v1),
+	 * or NULL if key does not exist in hash.
+	 */
+void**			BLI_edgehash_lookup_p	(EdgeHash *eh, int v0, int v1);
+
+	/* Return boolean true/false if edge (v0,v1) in hash. */
+int				BLI_edgehash_haskey		(EdgeHash *eh, int v0, int v1);
+
+	/* Return number of keys in hash. */
+int				BLI_edgehash_size		(EdgeHash *eh);
+
+#endif
+
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index a4882587618..379817cc322 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -7,6 +7,7 @@ blenlib_env = library_env.Copy ()
 
 source_files = ['intern/BLI_dynstr.c',
                 'intern/BLI_ghash.c',
+                'intern/edgehash.c',
                 'intern/BLI_linklist.c',
                 'intern/BLI_memarena.c',
                 'intern/arithb.c',
diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c
new file mode 100644
index 00000000000..538128a45d5
--- /dev/null
+++ b/source/blender/blenlib/intern/edgehash.c
@@ -0,0 +1,161 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL/BL DUAL 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. The Blender
+ * Foundation also sells licenses for use in proprietary software under
+ * the Blender License.  See http://www.blender.org/BL/ for information
+ * about this.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: none of this file.
+ *
+ * Contributor(s): Daniel Dunbar
+ *
+ * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * A general (pointer -> pointer) hash table ADT
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "MEM_guardedalloc.h"
+#include "BLI_edgehash.h"
+
+/***/
+
+static unsigned int hashsizes[]= {
+	1, 3, 5, 11, 17, 37, 67, 131, 257, 521, 1031, 2053, 4099, 8209, 
+	16411, 32771, 65537, 131101, 262147, 524309, 1048583, 2097169, 
+	4194319, 8388617, 16777259, 33554467, 67108879, 134217757, 
+	268435459
+};
+
+#define EDGEHASH(v0,v1)		((v0*39)^(v1*31))
+
+/***/
+
+typedef struct Entry Entry;
+struct Entry {
+	Entry *next;
+	int v0, v1;
+	void *val;
+};
+
+struct EdgeHash {
+	Entry **buckets;
+	int nbuckets, nentries, cursize;
+};
+
+/***/
+
+EdgeHash *BLI_edgehash_new(void) {
+	EdgeHash *eh= MEM_mallocN(sizeof(*eh), "EdgeHash");
+	eh->cursize= 0;
+	eh->nentries= 0;
+	eh->nbuckets= hashsizes[eh->cursize];
+	
+	eh->buckets= malloc(eh->nbuckets*sizeof(*eh->buckets));
+	memset(eh->buckets, 0, eh->nbuckets*sizeof(*eh->buckets));
+	
+	return eh;
+}
+
+void BLI_edgehash_insert(EdgeHash *eh, int v0, int v1, void *val) {
+	unsigned int hash;
+	Entry *e= malloc(sizeof(*e));
+
+	if (v1<v0) v0 ^= v1 ^= v0 ^= v1;
+	hash = EDGEHASH(v0,v1)%eh->nbuckets;
+
+	e->v0 = v0;
+	e->v1 = v1;
+	e->val = val;
+	e->next= eh->buckets[hash];
+	eh->buckets[hash]= e;
+	
+	if (++eh->nentries>eh->nbuckets*3) {
+		Entry *e, **old= eh->buckets;
+		int i, nold= eh->nbuckets;
+		
+		eh->nbuckets= hashsizes[++eh->cursize];
+		eh->buckets= malloc(eh->nbuckets*sizeof(*eh->buckets));
+		memset(eh->buckets, 0, eh->nbuckets*sizeof(*eh->buckets));
+		
+		for (i=0; i<nold; i++) {
+			for (e= old[i]; e;) {
+				Entry *n= e->next;
+				
+				hash= EDGEHASH(e->v0,e->v1)%eh->nbuckets;
+				e->next= eh->buckets[hash];
+				eh->buckets[hash]= e;
+				
+				e= n;
+			}
+		}
+		
+		free(old);
+	}
+}
+
+void** BLI_edgehash_lookup_p(EdgeHash *eh, int v0, int v1) {
+	unsigned int hash;
+	Entry *e;
+
+	if (v1<v0) v0 ^= v1 ^= v0 ^= v1;
+	hash = EDGEHASH(v0,v1)%eh->nbuckets;
+	for (e= eh->buckets[hash]; e; e= e->next)
+		if (v0==e->v0 && v1==e->v1)
+			return &e->val;
+	
+	return NULL;
+}
+
+void* BLI_edgehash_lookup(EdgeHash *eh, int v0, int v1) {
+	void **value_p = BLI_edgehash_lookup_p(eh,v0,v1);
+
+	return value_p?*value_p:NULL;
+}
+
+int BLI_edgehash_haskey(EdgeHash *eh, int v0, int v1) {
+	return BLI_edgehash_lookup_p(eh, v0, v1)!=NULL;
+}
+
+int BLI_edgehash_size(EdgeHash *eh) {
+	return eh->nentries;
+}
+
+void BLI_edgehash_free(EdgeHash *eh, EdgeHashFreeFP valfreefp) {
+	int i;
+	
+	for (i=0; i<eh->nbuckets; i++) {
+		Entry *e;
+		
+		for (e= eh->buckets[i]; e; ) {
+			Entry *n= e->next;
+			
+			if (valfreefp) valfreefp(e->val);
+			free(e);
+			
+			e= n;
+		}
+	}
+	
+	free(eh->buckets);
+	MEM_freeN(eh);
+}