Author: ArcRiley
Date: 2008-02-07 11:39:50 -0500 (Thu, 07 Feb 2008)
New Revision: 836
Modified:
trunk/pysoy/src/_core-common/_coreLoop.pxi
trunk/pysoy/src/_internals/Loadable.pxi
trunk/pysoy/src/_internals/soy._internals.pxd
trunk/pysoy/src/textures/Texture.pxi
trunk/pysoy/src/textures/Video.pxi
trunk/pysoy/src/textures/soy.textures.pxd
trunk/pysoy/src/transports/Transport.pxi
trunk/pysoy/src/transports/soy.transports.pxd
Log:
#902 - renamed _process and _load to _core*
Modified: trunk/pysoy/src/_core-common/_coreLoop.pxi
===================================================================
--- trunk/pysoy/src/_core-common/_coreLoop.pxi 2008-02-07 16:38:16 UTC (rev
835)
+++ trunk/pysoy/src/_core-common/_coreLoop.pxi 2008-02-07 16:39:50 UTC (rev
836)
@@ -29,7 +29,7 @@
while (1) :
_transports.lock()
for i from 0 <= i < _transports.current :
- (<soy.transports.Transport> _transports.list[i])._process()
+ (<soy.transports.Transport> _transports.list[i])._coreProcess()
_transports.unlock()
_screens.lock()
for i from 0 <= i < _screens.current :
Modified: trunk/pysoy/src/_internals/Loadable.pxi
===================================================================
--- trunk/pysoy/src/_internals/Loadable.pxi 2008-02-07 16:38:16 UTC (rev
835)
+++ trunk/pysoy/src/_internals/Loadable.pxi 2008-02-07 16:39:50 UTC (rev
836)
@@ -27,7 +27,7 @@
def __cinit__(self, source=None, *args, **keywords) :
self._source = source
- cdef int _load(self, void *_data, int _size) :
+ cdef int _coreLoad(self, void *_data, int _size) :
return 0
cdef int _save(self, void *_data, int _size) :
Modified: trunk/pysoy/src/_internals/soy._internals.pxd
===================================================================
--- trunk/pysoy/src/_internals/soy._internals.pxd 2008-02-07 16:38:16 UTC
(rev 835)
+++ trunk/pysoy/src/_internals/soy._internals.pxd 2008-02-07 16:39:50 UTC
(rev 836)
@@ -48,7 +48,7 @@
cdef class Loadable :
cdef object _source
cdef int _state
- cdef int _load(self, void*, int)
+ cdef int _coreLoad(self, void*, int)
cdef int _save(self, void*, int)
cdef int _ready(self)
Modified: trunk/pysoy/src/textures/Texture.pxi
===================================================================
--- trunk/pysoy/src/textures/Texture.pxi 2008-02-07 16:38:16 UTC (rev
835)
+++ trunk/pysoy/src/textures/Texture.pxi 2008-02-07 16:39:50 UTC (rev
836)
@@ -33,34 +33,17 @@
self._oFormats[3] = gl.GL_RGB
self._oFormats[4] = gl.GL_RGBA
- cdef int _load(self, void *_data, int _size) :
- if self._state == 0 :
- self._state = self._loadPacket0(<unsigned char *> _data, _size)
- elif self._state == 1 :
- self._state = self._loadPacket1(<unsigned char *> _data, _size)
+ def __dealloc__(self) :
+ if self._textureID != 0 :
+ gl.glDeleteTextures(1, &self._textureID)
+ self._resize(0,0,0,0)
+ py.PyThread_free_lock(self._mutex)
- cdef int _loadPacket0(self, unsigned char *_data, int _size) :
- '''
- char _chans
- char _width \
- char _height } These are in values of 2^
- char _depth /
- '''
- if _data[0] > 0 and _data[0] < 5 :
- self._resize(_data[0], 1 << _data[1], 1 << _data[2], 1 << _data[3])
- return 1
- else :
- return -1
+ ##########################################################################
+ #
+ # Properties
+ #
- cdef int _loadPacket1(self, unsigned char *_data, int _size) :
- '''
- Currently craptacularly common code crying for completion
- '''
- cdef int i
- for i from 0 <= i < _size :
- self._texels[i] = _data[i]
- return -1
-
property aspect :
'''Texture's aspect ratio
@@ -111,6 +94,54 @@
return <char *> self._texels
+ ##########################################################################
+ #
+ # General Functions
+ #
+
+ cdef void _resize(self, int c, int x, int y, int z) :
+ cdef long int _size
+ _size = c*x*y*z
+ if _size == 0 :
+ self._textureTarget = 0
+ if self._width != 0 :
+ py.PyMem_Free(self._texels)
+ elif z == 1 :
+ if y == 1 :
+ self._textureTarget = gl.GL_TEXTURE_1D
+ else :
+ self._textureTarget = gl.GL_TEXTURE_2D
+ else :
+ self._textureTarget = gl.GL_TEXTURE_3D
+ if _size :
+ if self._width :
+ if self._chans*self._width*self._height*self._depth != _size :
+ self._texels = <gl.GLubyte *> py.PyMem_Realloc(self._texels, _size)
+ else :
+ self._texels = <gl.GLubyte *> py.PyMem_Malloc(_size)
+ self._chans = c
+ self._width = x
+ self._height = y
+ self._depth = z
+
+
+ cdef int _squareup(self, int _v) :
+ # This handy hack courtesy Sean Anderson, see:
+ # http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+ _v = _v - 1
+ _v = _v | _v >> 1
+ _v = _v | _v >> 2
+ _v = _v | _v >> 4
+ _v = _v | _v >> 8
+ _v = _v | _v >> 16
+ return _v + 1
+
+
+ ##########################################################################
+ #
+ # _coreLoop Functions
+ #
+
cdef void _coreBind(self) :
py.PyThread_acquire_lock(self._mutex,1)
if self._textureTarget == gl.GL_TEXTURE_1D :
@@ -162,7 +193,6 @@
#if max_size > self._width or max_size > self._height :
# raise ValueError('Image size exceeds max texture size, which is %d
pixels for each side'%max_size)
-
cdef void _coreUnBind(self) :
if self._textureTarget == gl.GL_TEXTURE_1D :
gl.glDisable(gl.GL_TEXTURE_1D)
@@ -175,47 +205,30 @@
gl.glLoadIdentity()
py.PyThread_release_lock(self._mutex)
+ cdef int _coreLoad(self, void *_data, int _size) :
+ if self._state == 0 :
+ self._state = self._coreLoadPacket0(<unsigned char *> _data, _size)
+ elif self._state == 1 :
+ self._state = self._coreLoadPacket1(<unsigned char *> _data, _size)
- cdef void _resize(self, int c, int x, int y, int z) :
- cdef long int _size
- _size = c*x*y*z
- if _size == 0 :
- self._textureTarget = 0
- if self._width != 0 :
- py.PyMem_Free(self._texels)
- elif z == 1 :
- if y == 1 :
- self._textureTarget = gl.GL_TEXTURE_1D
- else :
- self._textureTarget = gl.GL_TEXTURE_2D
+ cdef int _coreLoadPacket0(self, unsigned char *_data, int _size) :
+ '''
+ char _chans
+ char _width \
+ char _height } These are in values of 2^
+ char _depth /
+ '''
+ if _data[0] > 0 and _data[0] < 5 :
+ self._resize(_data[0], 1 << _data[1], 1 << _data[2], 1 << _data[3])
+ return 1
else :
- self._textureTarget = gl.GL_TEXTURE_3D
- if _size :
- if self._width :
- if self._chans*self._width*self._height*self._depth != _size :
- self._texels = <gl.GLubyte *> py.PyMem_Realloc(self._texels, _size)
- else :
- self._texels = <gl.GLubyte *> py.PyMem_Malloc(_size)
- self._chans = c
- self._width = x
- self._height = y
- self._depth = z
+ return -1
-
- cdef int _squareup(self, int _v) :
- # This handy hack courtesy Sean Anderson, see:
- # http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
- _v = _v - 1
- _v = _v | _v >> 1
- _v = _v | _v >> 2
- _v = _v | _v >> 4
- _v = _v | _v >> 8
- _v = _v | _v >> 16
- return _v + 1
-
-
- def __dealloc__(self) :
- if self._textureID != 0 :
- gl.glDeleteTextures(1, &self._textureID)
- self._resize(0,0,0,0)
- py.PyThread_free_lock(self._mutex)
+ cdef int _coreLoadPacket1(self, unsigned char *_data, int _size) :
+ '''
+ Currently craptacularly common code crying for completion
+ '''
+ cdef int i
+ for i from 0 <= i < _size :
+ self._texels[i] = _data[i]
+ return -1
Modified: trunk/pysoy/src/textures/Video.pxi
===================================================================
--- trunk/pysoy/src/textures/Video.pxi 2008-02-07 16:38:16 UTC (rev 835)
+++ trunk/pysoy/src/textures/Video.pxi 2008-02-07 16:39:50 UTC (rev 836)
@@ -23,7 +23,7 @@
Renders an Ogg Theora stream to a texture
'''
- cdef int _load(self, void *_data, int _size) :
+ cdef int _coreLoad(self, void *_data, int _size) :
cdef int x, y, _cx, _cy, _tx, _ty, _yl, _yc
cdef int _py, _pu, _pv, _pr, _pg, _pb
cdef ogg.ogg_page *_page
Modified: trunk/pysoy/src/textures/soy.textures.pxd
===================================================================
--- trunk/pysoy/src/textures/soy.textures.pxd 2008-02-07 16:38:16 UTC (rev
835)
+++ trunk/pysoy/src/textures/soy.textures.pxd 2008-02-07 16:39:50 UTC (rev
836)
@@ -45,8 +45,8 @@
cdef int _oFormats[5]
#
# C functions
- cdef int _loadPacket0(self, unsigned char*, int)
- cdef int _loadPacket1(self, unsigned char*, int)
+ cdef int _coreLoadPacket0(self, unsigned char*, int)
+ cdef int _coreLoadPacket1(self, unsigned char*, int)
cdef void _coreBind(self)
cdef void _coreUnBind(self)
cdef void _resize(self, int, int, int, int)
Modified: trunk/pysoy/src/transports/Transport.pxi
===================================================================
--- trunk/pysoy/src/transports/Transport.pxi 2008-02-07 16:38:16 UTC (rev
835)
+++ trunk/pysoy/src/transports/Transport.pxi 2008-02-07 16:39:50 UTC (rev
836)
@@ -68,14 +68,14 @@
# This is called by _coreLoop()
- cdef void _process(self) :
+ cdef void _coreProcess(self) :
if self._mode == 0 :
return
elif self._mode == 1 :
if self._vers == 0 :
- self._loadSoy()
+ self._coreLoadSoy()
elif self._vers == 1 :
- self._loadOgg()
+ self._coreLoadOgg()
# If finished loading/saving, decref just before returning
#py.Py_DECREF(self)
@@ -169,7 +169,7 @@
self._vers = 0 # Soy
self._mode = 1 # Loading
- cdef void _loadSoy(self) :
+ cdef void _coreLoadSoy(self) :
cdef unsigned char *_data
cdef unsigned int _serial, _length
self._readSoy(<char *> (&_serial), 4)
@@ -181,7 +181,7 @@
if self._mode == 0 :
py.PyMem_Free(_data)
return
- (<soy._internals.Loadable> self._objs[_serial].object)._load(_data,_length)
+ (<soy._internals.Loadable>
self._objs[_serial].object)._coreLoad(_data,_length)
py.PyMem_Free(_data)
cdef void _readSoy(self, char *_buffer, int _len) :
@@ -215,7 +215,7 @@
if not ogg.ogg_page_bos(&_page) :
i = self._findSrno(ogg.ogg_page_serialno(&_page))
if i >= 0 :
- (<soy._internals.Loadable> self._objs[i].object)._load(&_page, 0)
+ (<soy._internals.Loadable> self._objs[i].object)._coreLoad(&_page, 0)
break
_sn = ogg.ogg_page_serialno(&_page)
ogg.ogg_stream_init(&_testStream, _sn)
@@ -225,7 +225,7 @@
m = ogg.oggpackB_read(&_buffer, 32)
if m == 2155112549L :
i = self._initObjt(_sn, 'video', soy.textures.Video())
- (<soy._internals.Loadable> self._objs[i].object)._load(&_page, 0)
+ (<soy._internals.Loadable> self._objs[i].object)._coreLoad(&_page, 0)
# 24538994 = vorbis
# 7828073 = writ
# 1399874917L = speex
@@ -238,12 +238,12 @@
_sn = ogg.ogg_page_serialno(&_page)
i = self._findSrno(_sn)
if i >= 0 :
- (<soy._internals.Loadable> self._objs[i].object)._load(&_page, 0)
+ (<soy._internals.Loadable> self._objs[i].object)._coreLoad(&_page, 0)
self._vers = 1 # Ogg
self._mode = 1 # Loading
- cdef void _loadOgg(self) :
+ cdef void _coreLoadOgg(self) :
cdef int i, _sn
cdef ogg.ogg_page _page
if not (<soy._internals.Loadable> self._objs[0].object)._ready() :
@@ -252,7 +252,7 @@
_sn = ogg.ogg_page_serialno(&_page)
i = self._findSrno(_sn)
if i >= 0 :
- (<soy._internals.Loadable> self._objs[i].object)._load(&_page, 0)
+ (<soy._internals.Loadable> self._objs[i].object)._coreLoad(&_page, 0)
else :
if self._loop :
self._rewind()
Modified: trunk/pysoy/src/transports/soy.transports.pxd
===================================================================
--- trunk/pysoy/src/transports/soy.transports.pxd 2008-02-07 16:38:16 UTC
(rev 835)
+++ trunk/pysoy/src/transports/soy.transports.pxd 2008-02-07 16:39:50 UTC
(rev 836)
@@ -42,7 +42,7 @@
cdef ogg.ogg_sync_state _sync
#
# General Functions
- cdef void _process(self)
+ cdef void _coreProcess(self)
cdef int _initObjt(self, int, object, object)
cdef int _findName(self, char*, unsigned char)
cdef int _findSrno(self, int)
@@ -59,12 +59,12 @@
#
# Soy functions
cdef void _headSoy(self)
- cdef void _loadSoy(self)
+ cdef void _coreLoadSoy(self)
cdef void _readSoy(self, char*, int)
#
# Ogg functions
cdef void _headOgg(self)
- cdef void _loadOgg(self)
+ cdef void _coreLoadOgg(self)
cdef int _readOggPage(self, ogg.ogg_page *_oggPage)
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
