Author: DerekRhodes
Date: 2008-03-15 22:29:20 -0400 (Sat, 15 Mar 2008)
New Revision: 1148
Modified:
trunk/pysoy/src/_datatypes/FaceList.pxi
trunk/pysoy/src/audio/Output.pxi
trunk/pysoy/src/joints/Joint.pxi
trunk/pysoy/src/scenes/Planar.pxi
trunk/pysoy/src/textures/Texture.pxi
trunk/pysoy/src/textures/Video.pxi
trunk/pysoy/src/transports/Transport.pxi
trunk/pysoy/src/widgets/Canvas.pxi
trunk/pysoy/src/windows/Window-x11.pxi
Log:
more declarator cleanup.
Modified: trunk/pysoy/src/_datatypes/FaceList.pxi
===================================================================
--- trunk/pysoy/src/_datatypes/FaceList.pxi 2008-03-15 03:07:16 UTC (rev
1147)
+++ trunk/pysoy/src/_datatypes/FaceList.pxi 2008-03-16 02:29:20 UTC (rev
1148)
@@ -76,7 +76,7 @@
cdef void _renderBuffer(self, int _offset, int _length) :
gl.glDrawElements (gl.GL_TRIANGLES, _length*3,
- gl.GL_UNSIGNED_SHORT, (<Face *> 0) + _offset)
+ gl.GL_UNSIGNED_SHORT, (<Face*> 0) + _offset)
cdef void _renderArrayBumpPass (self, int a, int b):
pass
@@ -137,8 +137,8 @@
cdef void _allocArray(self, int num) :
cdef soy.models.Mesh _mesh
_mesh = <soy.models.Mesh> self._mesh
- self._array = <Face *> self._alloc(num, &self._arrayAlloc,
+ self._array = <Face*> self._alloc(num, &self._arrayAlloc,
self._array, sizeof(Face))
- self._arrayList = <unsigned int *> self._alloc(num, &self._arrayAlloc,
+ self._arrayList = <unsigned int*> self._alloc(num, &self._arrayAlloc,
self._arrayList, 4)
Modified: trunk/pysoy/src/audio/Output.pxi
===================================================================
--- trunk/pysoy/src/audio/Output.pxi 2008-03-15 03:07:16 UTC (rev 1147)
+++ trunk/pysoy/src/audio/Output.pxi 2008-03-16 02:29:20 UTC (rev 1148)
@@ -50,4 +50,4 @@
return "<Output '%s'>" % self.__str__()
def __str__(self) :
- return <char *> al.alcGetString(self._device, al.ALC_DEVICE_SPECIFIER)
+ return <char*> al.alcGetString(self._device, al.ALC_DEVICE_SPECIFIER)
Modified: trunk/pysoy/src/joints/Joint.pxi
===================================================================
--- trunk/pysoy/src/joints/Joint.pxi 2008-03-15 03:07:16 UTC (rev 1147)
+++ trunk/pysoy/src/joints/Joint.pxi 2008-03-16 02:29:20 UTC (rev 1148)
@@ -39,7 +39,7 @@
def __dealloc__(self) :
self._scene._stepLock()
- self._scene._joints._remove(<void *> self)
+ self._scene._joints._remove(<void*> self)
ode.dJointDestroy(self._jointID)
self._scene._stepUnlock()
Modified: trunk/pysoy/src/scenes/Planar.pxi
===================================================================
--- trunk/pysoy/src/scenes/Planar.pxi 2008-03-15 03:07:16 UTC (rev 1147)
+++ trunk/pysoy/src/scenes/Planar.pxi 2008-03-16 02:29:20 UTC (rev 1148)
@@ -112,10 +112,10 @@
#self._coreGetModelview(mtx)
#gl.glPushMatrix()
#gl.glMultMatrixf(mtx)
- #(<soy.models.Mesh> self._mesh)._render(<void *> self)#Faces go here?
+ #(<soy.models.Mesh> self._mesh)._render(<void*> self)#Faces go here?
#
gl.glDrawElements (gl.GL_TRIANGLES, 60, gl.GL_UNSIGNED_SHORT,
- <unsigned short *> self._faces)
+ <unsigned short*> self._faces)
#gl.glPopMatrix()
self._material._coreUnBind()
Modified: trunk/pysoy/src/textures/Texture.pxi
===================================================================
--- trunk/pysoy/src/textures/Texture.pxi 2008-03-15 03:07:16 UTC (rev
1147)
+++ trunk/pysoy/src/textures/Texture.pxi 2008-03-16 02:29:20 UTC (rev
1148)
@@ -91,7 +91,7 @@
Uncompressed pixel data
'''
def __get__(self) :
- return <char *> self._texels
+ return <char*> self._texels
##########################################################################
@@ -116,9 +116,9 @@
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)
+ self._texels = <gl.GLubyte*> py.PyMem_Realloc(self._texels, _size)
else :
- self._texels = <gl.GLubyte *> py.PyMem_Malloc(_size)
+ self._texels = <gl.GLubyte*> py.PyMem_Malloc(_size)
self._chans = c
self._width = x
self._height = y
@@ -207,9 +207,9 @@
cdef int _coreLoad(self, void *_data, int _size) :
if self._state == 0 :
- self._state = self._coreLoadPacket0(<unsigned char *> _data, _size)
+ self._state = self._coreLoadPacket0(<unsigned char*> _data, _size)
elif self._state == 1 :
- self._state = self._coreLoadPacket1(<unsigned char *> _data, _size)
+ self._state = self._coreLoadPacket1(<unsigned char*> _data, _size)
cdef int _coreLoadPacket0(self, unsigned char *_data, int _size) :
'''
Modified: trunk/pysoy/src/textures/Video.pxi
===================================================================
--- trunk/pysoy/src/textures/Video.pxi 2008-03-15 03:07:16 UTC (rev 1147)
+++ trunk/pysoy/src/textures/Video.pxi 2008-03-16 02:29:20 UTC (rev 1148)
@@ -38,7 +38,7 @@
ogg.theora_comment_clear(&self._comment)
ogg.theora_clear(&self._decode)
return 0
- _page = <ogg.ogg_page *> _data
+ _page = <ogg.ogg_page*> _data
#
# For Chaining/Looping
if ogg.ogg_page_bos(_page) :
@@ -134,7 +134,7 @@
cdef int _save(self, void *_data, int _size) :
cdef ogg.ogg_page *_page
- _page = <ogg.ogg_page *> _data
+ _page = <ogg.ogg_page*> _data
return 1
Modified: trunk/pysoy/src/transports/Transport.pxi
===================================================================
--- trunk/pysoy/src/transports/Transport.pxi 2008-03-15 03:07:16 UTC (rev
1147)
+++ trunk/pysoy/src/transports/Transport.pxi 2008-03-16 02:29:20 UTC (rev
1148)
@@ -24,7 +24,7 @@
'''
def __init__(self, path, loop=1, *args, **keywords) :
cdef char _magic[4]
- self._objs = <Stored *> py.PyMem_Malloc(sizeof(Stored) * 4)
+ self._objs = <Stored*> py.PyMem_Malloc(sizeof(Stored) * 4)
self._mobj = 4
self._dict = {}
if self._open(path) :
@@ -67,7 +67,7 @@
cdef int i
if self._mobj <= self._nobj :
self._mobj = self._mobj + 4
- self._objs = <Stored *> py.PyMem_Realloc(self._objs,
+ self._objs = <Stored*> py.PyMem_Realloc(self._objs,
sizeof(Stored) * self._mobj)
self._objs[self._nobj].serialno = _serialno
for i from 0 <= i < len(_name) :
@@ -139,14 +139,14 @@
cdef unsigned char _key[256], _cls[256]
cdef object _keystr, _clsstr
# We're assuming little endian here
- self._read(<char *> (&_nobj), 4)
+ self._read(<char*> (&_nobj), 4)
for _i from 0 <= _i < _nobj :
- self._read(<char *> (&_l), 1)
- self._read(<char *> _key, _l)
- _keystr = py.PyString_FromStringAndSize(<char *> _key, _l)
- self._read(<char *> (&_l), 1)
- self._read(<char *> _cls, _l)
- _clsstr = py.PyString_FromStringAndSize(<char *> _cls, _l)
+ self._read(<char*> (&_l), 1)
+ self._read(<char*> _key, _l)
+ _keystr = py.PyString_FromStringAndSize(<char*> _key, _l)
+ self._read(<char*> (&_l), 1)
+ self._read(<char*> _cls, _l)
+ _clsstr = py.PyString_FromStringAndSize(<char*> _cls, _l)
if _clsstr == 'soy.textures.Texture' :
self._initObjt(_i, _keystr, soy.textures.Texture(source=self))
self._vers = 0 # Soy
@@ -155,12 +155,12 @@
cdef void _coreLoadSoy(self) :
cdef unsigned char *_data
cdef unsigned int _serial, _length
- self._readSoy(<char *> (&_serial), 4)
- self._readSoy(<char *> (&_length), 4)
+ self._readSoy(<char*> (&_serial), 4)
+ self._readSoy(<char*> (&_length), 4)
if self._mode == 0 :
return
- _data = <unsigned char *> py.PyMem_Malloc(_length)
- self._read(<char *> (_data), _length)
+ _data = <unsigned char*> py.PyMem_Malloc(_length)
+ self._read(<char*> (_data), _length)
if self._mode == 0 :
py.PyMem_Free(_data)
return
Modified: trunk/pysoy/src/widgets/Canvas.pxi
===================================================================
--- trunk/pysoy/src/widgets/Canvas.pxi 2008-03-15 03:07:16 UTC (rev 1147)
+++ trunk/pysoy/src/widgets/Canvas.pxi 2008-03-16 02:29:20 UTC (rev 1148)
@@ -98,7 +98,7 @@
gl.glTexCoordPointer(3, gl.GL_FLOAT, 48, &self._verts[0].tx)
gl.glDrawElements (gl.GL_TRIANGLES, 6, gl.GL_UNSIGNED_SHORT,
- <unsigned short *> self._faces)
+ <unsigned short*> self._faces)
if (<soy.textures.Texture> self._texture)._chans & 1:
pass
Modified: trunk/pysoy/src/windows/Window-x11.pxi
===================================================================
--- trunk/pysoy/src/windows/Window-x11.pxi 2008-03-15 03:07:16 UTC (rev
1147)
+++ trunk/pysoy/src/windows/Window-x11.pxi 2008-03-16 02:29:20 UTC (rev
1148)
@@ -58,7 +58,7 @@
if splash :
self._splash = 1
_windows.lock()
- _windows.append(<void *>self)
+ _windows.append(<void*>self)
_windows.unlock()
self._create(position[0], position[1], size[0], size[1])
@@ -66,7 +66,7 @@
if self._windowID :
self._destroy()
_windows.lock()
- _windows.remove(<void *>self)
+ _windows.remove(<void*>self)
_windows.unlock()
cdef void _openedWait(self, int _op) :
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
