Author: ArcRiley Date: 2008-02-07 01:37:34 -0500 (Thu, 07 Feb 2008) New Revision: 823
Added: trunk/pysoy/src/_internals/PointerSet.pxi Removed: trunk/pysoy/src/_datatypes/PointerSet.pxi Modified: trunk/pysoy/src/_core-common/_callback.pxi trunk/pysoy/src/_core-common/_coreLoop.pxi trunk/pysoy/src/_core-w32/soy._core.pyx trunk/pysoy/src/_core-x11/soy._core.pyx trunk/pysoy/src/_datatypes/soy._datatypes.pxd trunk/pysoy/src/_datatypes/soy._datatypes.pyx trunk/pysoy/src/_internals/soy._internals.pxd trunk/pysoy/src/_internals/soy._internals.pyx Log: moved PointerSet from _datatypes to _internals Modified: trunk/pysoy/src/_core-common/_callback.pxi =================================================================== --- trunk/pysoy/src/_core-common/_callback.pxi 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_core-common/_callback.pxi 2008-02-07 06:37:34 UTC (rev 823) @@ -17,10 +17,10 @@ # # $Id$ -cdef soy._datatypes.PointerSet _callfields +cdef soy._internals.PointerSet _callfields cdef ode.dJointGroupID _contactgroup -_callfields = soy._datatypes.PointerSet() +_callfields = soy._internals.PointerSet() _contactgroup = ode.dJointGroupCreate(0) cdef void _callback(void* data, ode.dGeomID o1, ode.dGeomID o2) : Modified: trunk/pysoy/src/_core-common/_coreLoop.pxi =================================================================== --- trunk/pysoy/src/_core-common/_coreLoop.pxi 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_core-common/_coreLoop.pxi 2008-02-07 06:37:34 UTC (rev 823) @@ -17,11 +17,9 @@ # # $Id$ -cimport soy.transports +cdef soy._internals.PointerSet _givefields +_givefields = soy._internals.PointerSet() -cdef soy._datatypes.PointerSet _givefields -_givefields = soy._datatypes.PointerSet() - cdef void _coreLoop() : cdef int i, j cdef int _step, _maxstep Modified: trunk/pysoy/src/_core-w32/soy._core.pyx =================================================================== --- trunk/pysoy/src/_core-w32/soy._core.pyx 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_core-w32/soy._core.pyx 2008-02-07 06:37:34 UTC (rev 823) @@ -29,6 +29,7 @@ cimport soy.bodies.fields cimport soy.bodies._bodies cimport soy.scenes +cimport soy.transports cimport soy.widgets import soy.colors Modified: trunk/pysoy/src/_core-x11/soy._core.pyx =================================================================== --- trunk/pysoy/src/_core-x11/soy._core.pyx 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_core-x11/soy._core.pyx 2008-02-07 06:37:34 UTC (rev 823) @@ -29,6 +29,7 @@ cimport soy.bodies.fields cimport soy.bodies._bodies cimport soy.scenes +cimport soy.transports cimport soy.widgets import soy.colors Deleted: trunk/pysoy/src/_datatypes/PointerSet.pxi =================================================================== --- trunk/pysoy/src/_datatypes/PointerSet.pxi 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_datatypes/PointerSet.pxi 2008-02-07 06:37:34 UTC (rev 823) @@ -1,45 +0,0 @@ -# PySoy PointerSet class -# -# Copyright (C) 2006,2007,2008 PySoy Group -# -# 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 3 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, see http://www.gnu.org/licenses -# -# $Id: HashTable.pxi 431 2007-07-08 21:55:51Z EricStein $ - -cdef class PointerSet : - '''Store a distinct list of pointers - - Uses GLib HashTables. - ''' - def __cinit__(self) : - self._hashtable = glib.g_hash_table_new(glib.g_direct_hash, glib.g_direct_equal) - - def __dealloc__(self) : - glib.g_hash_table_destroy(self._hashtable) - - cdef void _insert(self, void* key) : - glib.g_hash_table_insert(self._hashtable, key, NULL) - - cdef int _has_key(self, void* key) : - cdef glib.gpointer k, d - return glib.g_hash_table_lookup_extended(self._hashtable, key, &k, &d) - - cdef int _remove(self, void* key) : - return glib.g_hash_table_remove(self._hashtable, key) - - cdef void _empty(self) : - glib.g_hash_table_remove_all(self._hashtable) - - cdef void _foreach(self, glib.GHFunc function, void* user_data) : - glib.g_hash_table_foreach(self._hashtable, function, user_data) Modified: trunk/pysoy/src/_datatypes/soy._datatypes.pxd =================================================================== --- trunk/pysoy/src/_datatypes/soy._datatypes.pxd 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_datatypes/soy._datatypes.pxd 2008-02-07 06:37:34 UTC (rev 823) @@ -58,14 +58,6 @@ cdef int _has_key(self, char*) cdef int _remove(self, char*) -cdef class PointerSet : - cdef glib.GHashTable* _hashtable - cdef void _insert(self, void*) - cdef int _has_key(self, void*) - cdef int _remove(self, void*) - cdef void _empty(self) - cdef void _foreach(self, glib.GHFunc, void*) - cdef class Datatype : cdef void *_alloc(self, int, int*, void*, int) Modified: trunk/pysoy/src/_datatypes/soy._datatypes.pyx =================================================================== --- trunk/pysoy/src/_datatypes/soy._datatypes.pyx 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_datatypes/soy._datatypes.pyx 2008-02-07 06:37:34 UTC (rev 823) @@ -36,7 +36,6 @@ include "Datatype.pxi" include "HashTable.pxi" -include "PointerSet.pxi" include "MaterialList.pxi" include "FaceList.pxi" include "VertexList.pxi" Copied: trunk/pysoy/src/_internals/PointerSet.pxi (from rev 817, trunk/pysoy/src/_datatypes/PointerSet.pxi) =================================================================== --- trunk/pysoy/src/_internals/PointerSet.pxi (rev 0) +++ trunk/pysoy/src/_internals/PointerSet.pxi 2008-02-07 06:37:34 UTC (rev 823) @@ -0,0 +1,45 @@ +# PySoy PointerSet class +# +# Copyright (C) 2006,2007,2008 PySoy Group +# +# 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 3 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, see http://www.gnu.org/licenses +# +# $Id: HashTable.pxi 431 2007-07-08 21:55:51Z EricStein $ + +cdef class PointerSet : + '''Store a distinct list of pointers + + Uses GLib HashTables. + ''' + def __cinit__(self) : + self._hashtable = glib.g_hash_table_new(glib.g_direct_hash, glib.g_direct_equal) + + def __dealloc__(self) : + glib.g_hash_table_destroy(self._hashtable) + + cdef void _insert(self, void* key) : + glib.g_hash_table_insert(self._hashtable, key, NULL) + + cdef int _has_key(self, void* key) : + cdef glib.gpointer k, d + return glib.g_hash_table_lookup_extended(self._hashtable, key, &k, &d) + + cdef int _remove(self, void* key) : + return glib.g_hash_table_remove(self._hashtable, key) + + cdef void _empty(self) : + glib.g_hash_table_remove_all(self._hashtable) + + cdef void _foreach(self, glib.GHFunc function, void* user_data) : + glib.g_hash_table_foreach(self._hashtable, function, user_data) Modified: trunk/pysoy/src/_internals/soy._internals.pxd =================================================================== --- trunk/pysoy/src/_internals/soy._internals.pxd 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_internals/soy._internals.pxd 2008-02-07 06:37:34 UTC (rev 823) @@ -52,4 +52,12 @@ cdef int _save(self, void*, int) cdef int _ready(self) +cdef class PointerSet : + cdef glib.GHashTable* _hashtable + cdef void _insert(self, void*) + cdef int _has_key(self, void*) + cdef int _remove(self, void*) + cdef void _empty(self) + cdef void _foreach(self, glib.GHFunc, void*) + cdef AsyncQueue _get_queue ( ) Modified: trunk/pysoy/src/_internals/soy._internals.pyx =================================================================== --- trunk/pysoy/src/_internals/soy._internals.pyx 2008-02-07 05:52:42 UTC (rev 822) +++ trunk/pysoy/src/_internals/soy._internals.pyx 2008-02-07 06:37:34 UTC (rev 823) @@ -29,6 +29,7 @@ include "AsyncQueue.pxi" include "Children.pxi" include "Loadable.pxi" +include "PointerSet.pxi" include "_get_queue.pxi" IF UNAME_SYSNAME == "Windows": _______________________________________________ PySoy-SVN mailing list [email protected] http://www.pysoy.org/mailman/listinfo/pysoy-svn
