Author: ArcRiley
Date: 2008-05-20 00:55:21 -0400 (Tue, 20 May 2008)
New Revision: 1286
Added:
trunk/pysoy/src/materials/_normalisationCubemap.pym
Removed:
trunk/pysoy/examples/CubeMap.py
trunk/pysoy/src/textures/NormalisationCubeMap.pym
Modified:
trunk/pysoy/include/soy.textures.pxd
trunk/pysoy/src/textures/soy.textures.pyx
Log:
Ticket #955 :
* moving textures.NormalisationCubeMap to materials._normalisationCubemap
* removing CubeMap example
* this revision doesn't compile
Deleted: trunk/pysoy/examples/CubeMap.py
===================================================================
--- trunk/pysoy/examples/CubeMap.py 2008-05-20 04:40:38 UTC (rev 1285)
+++ trunk/pysoy/examples/CubeMap.py 2008-05-20 04:55:21 UTC (rev 1286)
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-import soy
-import blocks2 as blocks
-from time import sleep
-
-sce = soy.scenes.Scene()
-sce.ambient = soy.colors.white
-cam = soy.bodies.Camera(sce)
-cam.position = (0.0, 0.0, 5.0)
-#lig = soy.bodies.Light(sce)
-#lig.position = (-10.0,10.0,2.0)
-
-tex = soy.textures.NormalisationCubeMap()
-mat = soy.materials.Textured(colormap=tex)
-black = soy.materials.Material()
-black.ambient = soy.colors.black
-black.diffuse = soy.colors.Color('#222')
-black.specular= soy.colors.Color('#222')
-black.shininess = 5.0
-
-colors = {
- 'One' : (mat, mat, (0,0,0)),
-}
-
-bks = blocks.blocks(sce, colors)
-
-fps = soy.textures.Print()
-
-scr = soy.Screen()
-win = soy.Window(scr, 'CollideBlocks', background=soy.colors.gray)
-pro = soy.widgets.Projector(win, camera=cam)
-can = soy.widgets.Canvas(win, texture=fps)
-
-def wireframeToggle() :
- if cam.wireframe :
- cam.wireframe = False
- else :
- cam.wireframe = True
-
-def fullscreenToggle() :
- if scr.fullscreen :
- scr.fullscreen = None
- else :
- scr.fullscreen = win
-
-def moreLight() :
- lig.diffuse = lig.diffuse + 1.0
- print lig.diffuse
-
-def lessLight() :
- lig.diffuse = lig.diffuse - 1.0
- print lig.diffuse
-
-key = soy.controllers.Keyboard(win)
-key['Q'] = soy.actions.Force(bks['One'], -100, 0, 0)
-key['R'] = soy.actions.Force(bks['One'], 0, 100, 0)
-key['S'] = soy.actions.Force(bks['One'], 100, 0, 0)
-key['T'] = soy.actions.Force(bks['One'], 0, -100, 0)
-key['U'] = soy.actions.Force(bks['One'], 0, 0, -100)
-key['V'] = soy.actions.Force(bks['One'], 0, 0, 100)
-key['q'] = soy.actions.Quit()
-key[ 1 ] = soy.actions.Quit() # 9 = esc key
-key['f'] = fullscreenToggle
-key['w'] = wireframeToggle
-key['['] = lessLight
-key[']'] = moreLight
-wcn = soy.controllers.Window(win)
-wcn['close'] = soy.actions.Quit()
-
-if __name__ == '__main__' :
- while True:
- sleep(.1)
- fps.text = '%sfps' % str(int(cam.fps)).zfill(4)
- for bk in bks :
- p = bks[bk].position
- v = bks[bk].velocity
- v = [v[0], v[1], v[2]]
- if abs(p[0]) > 5 and ((p[0]>0 and v[0]>0) or (p[0]<0 and v[0]< 0)) :
- v[0] = v[0]*-1
- if abs(p[1]) > 5 and ((p[1]>0 and v[1]>0) or (p[1]<0 and v[1]< 0)) :
- v[1] = v[1]*-1
- if abs(p[2]) > 5 and ((p[2]>0 and v[2]>0) or (p[2]<0 and v[2]< 0)) :
- v[2] = v[2]*-1
- bks[bk].velocity = v
-
Modified: trunk/pysoy/include/soy.textures.pxd
===================================================================
--- trunk/pysoy/include/soy.textures.pxd 2008-05-20 04:40:38 UTC (rev
1285)
+++ trunk/pysoy/include/soy.textures.pxd 2008-05-20 04:55:21 UTC (rev
1286)
@@ -71,6 +71,3 @@
cdef ogg.theora_state _decode
cdef double _startTime
cdef double _frameTime
-
-cdef class NormalisationCubeMap (Texture) :
- cdef int _null
Copied: trunk/pysoy/src/materials/_normalisationCubemap.pym (from rev 1285,
trunk/pysoy/src/textures/NormalisationCubeMap.pym)
===================================================================
--- trunk/pysoy/src/materials/_normalisationCubemap.pym
(rev 0)
+++ trunk/pysoy/src/materials/_normalisationCubemap.pym 2008-05-20 04:55:21 UTC
(rev 1286)
@@ -0,0 +1,143 @@
+cimport stdlib
+
+cdef class NormalisationCubeMap(Texture):
+ def __cinit__(self, *args, **keywords) :
+ cdef int i, j
+ cdef float _length
+ cdef float _vector[3]
+ cdef unsigned char* _ptr
+
+ self._resize(1, 3, 32, 32, 6)
+ _ptr = self._texels
+
+ # +X
+ for j from 0 < j <= 32:
+ for i from 0 < i <= 32:
+ _vector[0] = 16.0
+ _vector[1] = -(j + 0.5 - 16.0)
+ _vector[2] = -(i + 0.5 - 16.0)
+
+ _length = stdlib.sqrtf( _vector[0] * _vector[0] +
+ _vector[1] * _vector[1] +
+ _vector[2] * _vector[2] )
+
+ _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
+ _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
+ _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
+
+ _ptr[0] = <unsigned char> (_vector[0] * 255)
+ _ptr[1] = <unsigned char> (_vector[1] * 255)
+ _ptr[2] = <unsigned char> (_vector[2] * 255)
+ _ptr = _ptr + 3
+
+
+ #-X
+ for j from 0 < j <= 32:
+ for i from 0 < i <= 32:
+ _vector[0] = -16.0
+ _vector[1] = -(j + 0.5 - 16.0)
+ _vector[2] = (i + 0.5 - 16.0)
+
+ _length = stdlib.sqrtf( _vector[0] * _vector[0] +
+ _vector[1] * _vector[1] +
+ _vector[2] * _vector[2] )
+
+ _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
+ _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
+ _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
+
+ _ptr[0] = <unsigned char> (_vector[0] * 255)
+ _ptr[1] = <unsigned char> (_vector[1] * 255)
+ _ptr[2] = <unsigned char> (_vector[2] * 255)
+ _ptr = _ptr + 3
+
+ #+Y
+ for j from 0 < j <= 32:
+ for i from 0 < i <= 32:
+ _vector[0] = (i + 0.5 - 16.0)
+ _vector[1] = 16.0
+ _vector[2] = (j + 0.5 - 16.0)
+
+ _length = stdlib.sqrtf( _vector[0] * _vector[0] +
+ _vector[1] * _vector[1] +
+ _vector[2] * _vector[2] )
+
+ _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
+ _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
+ _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
+
+ _ptr[0] = <unsigned char> (_vector[0] * 255)
+ _ptr[1] = <unsigned char> (_vector[1] * 255)
+ _ptr[2] = <unsigned char> (_vector[2] * 255)
+ _ptr = _ptr + 3
+
+
+ #-Y
+ for j from 0 < j <= 32:
+ for i from 0 < i <= 32:
+ _vector[0] = (i + 0.5 - 16.0)
+ _vector[1] = -16.0
+ _vector[2] = -(j + 0.5 - 16.0)
+
+ _length = stdlib.sqrtf( _vector[0] * _vector[0] +
+ _vector[1] * _vector[1] +
+ _vector[2] * _vector[2] )
+
+ _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
+ _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
+ _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
+
+ _ptr[0] = <unsigned char> (_vector[0] * 255)
+ _ptr[1] = <unsigned char> (_vector[1] * 255)
+ _ptr[2] = <unsigned char> (_vector[2] * 255)
+ _ptr = _ptr + 3
+
+
+ #+Z
+ for j from 0 < j <= 32:
+ for i from 0 < i <= 32:
+ _vector[0] = (i + 0.5 - 16.0)
+ _vector[1] = -(j + 0.5 - 16.0)
+ _vector[2] = 16.0
+
+ _length = stdlib.sqrtf( _vector[0] * _vector[0] +
+ _vector[1] * _vector[1] +
+ _vector[2] * _vector[2] )
+
+ _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
+ _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
+ _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
+
+ _ptr[0] = <unsigned char> (_vector[0] * 255)
+ _ptr[1] = <unsigned char> (_vector[1] * 255)
+ _ptr[2] = <unsigned char> (_vector[2] * 255)
+ _ptr = _ptr + 3
+
+
+ #-Z
+ for j from 0 < j <= 32:
+ for i from 0 < i <= 32:
+ _vector[0] = -(i + 0.5 - 16.0)
+ _vector[1] = -(j + 0.5 - 16.0)
+ _vector[2] = -16.0
+
+ _length = stdlib.sqrtf( _vector[0] * _vector[0] +
+ _vector[1] * _vector[1] +
+ _vector[2] * _vector[2] )
+
+ _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
+ _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
+ _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
+
+ _ptr[0] = <unsigned char> (_vector[0] * 255)
+ _ptr[1] = <unsigned char> (_vector[1] * 255)
+ _ptr[2] = <unsigned char> (_vector[2] * 255)
+ _ptr = _ptr + 3
+
+ '''
+ gl.glTexParameteri(self._target, gl.GL_TEXTURE_MAG_FILTER, gl.GL_LINEAR)
+ gl.glTexParameteri(self._target, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR)
+ gl.glTexParameteri(self._target, gl.GL_TEXTURE_WRAP_S ,
gl.GL_CLAMP_TO_EDGE)
+ gl.glTexParameteri(self._target, gl.GL_TEXTURE_WRAP_T ,
gl.GL_CLAMP_TO_EDGE)
+ gl.glTexParameteri(self._target, gl.GL_TEXTURE_WRAP_R ,
gl.GL_CLAMP_TO_EDGE)
+ '''
Property changes on: trunk/pysoy/src/materials/_normalisationCubemap.pym
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:mergeinfo
+
Deleted: trunk/pysoy/src/textures/NormalisationCubeMap.pym
===================================================================
--- trunk/pysoy/src/textures/NormalisationCubeMap.pym 2008-05-20 04:40:38 UTC
(rev 1285)
+++ trunk/pysoy/src/textures/NormalisationCubeMap.pym 2008-05-20 04:55:21 UTC
(rev 1286)
@@ -1,143 +0,0 @@
-cimport stdlib
-
-cdef class NormalisationCubeMap(Texture):
- def __cinit__(self, *args, **keywords) :
- cdef int i, j
- cdef float _length
- cdef float _vector[3]
- cdef unsigned char* _ptr
-
- self._resize(1, 3, 32, 32, 6)
- _ptr = self._texels
-
- # +X
- for j from 0 < j <= 32:
- for i from 0 < i <= 32:
- _vector[0] = 16.0
- _vector[1] = -(j + 0.5 - 16.0)
- _vector[2] = -(i + 0.5 - 16.0)
-
- _length = stdlib.sqrtf( _vector[0] * _vector[0] +
- _vector[1] * _vector[1] +
- _vector[2] * _vector[2] )
-
- _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
- _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
- _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
-
- _ptr[0] = <unsigned char> (_vector[0] * 255)
- _ptr[1] = <unsigned char> (_vector[1] * 255)
- _ptr[2] = <unsigned char> (_vector[2] * 255)
- _ptr = _ptr + 3
-
-
- #-X
- for j from 0 < j <= 32:
- for i from 0 < i <= 32:
- _vector[0] = -16.0
- _vector[1] = -(j + 0.5 - 16.0)
- _vector[2] = (i + 0.5 - 16.0)
-
- _length = stdlib.sqrtf( _vector[0] * _vector[0] +
- _vector[1] * _vector[1] +
- _vector[2] * _vector[2] )
-
- _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
- _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
- _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
-
- _ptr[0] = <unsigned char> (_vector[0] * 255)
- _ptr[1] = <unsigned char> (_vector[1] * 255)
- _ptr[2] = <unsigned char> (_vector[2] * 255)
- _ptr = _ptr + 3
-
- #+Y
- for j from 0 < j <= 32:
- for i from 0 < i <= 32:
- _vector[0] = (i + 0.5 - 16.0)
- _vector[1] = 16.0
- _vector[2] = (j + 0.5 - 16.0)
-
- _length = stdlib.sqrtf( _vector[0] * _vector[0] +
- _vector[1] * _vector[1] +
- _vector[2] * _vector[2] )
-
- _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
- _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
- _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
-
- _ptr[0] = <unsigned char> (_vector[0] * 255)
- _ptr[1] = <unsigned char> (_vector[1] * 255)
- _ptr[2] = <unsigned char> (_vector[2] * 255)
- _ptr = _ptr + 3
-
-
- #-Y
- for j from 0 < j <= 32:
- for i from 0 < i <= 32:
- _vector[0] = (i + 0.5 - 16.0)
- _vector[1] = -16.0
- _vector[2] = -(j + 0.5 - 16.0)
-
- _length = stdlib.sqrtf( _vector[0] * _vector[0] +
- _vector[1] * _vector[1] +
- _vector[2] * _vector[2] )
-
- _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
- _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
- _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
-
- _ptr[0] = <unsigned char> (_vector[0] * 255)
- _ptr[1] = <unsigned char> (_vector[1] * 255)
- _ptr[2] = <unsigned char> (_vector[2] * 255)
- _ptr = _ptr + 3
-
-
- #+Z
- for j from 0 < j <= 32:
- for i from 0 < i <= 32:
- _vector[0] = (i + 0.5 - 16.0)
- _vector[1] = -(j + 0.5 - 16.0)
- _vector[2] = 16.0
-
- _length = stdlib.sqrtf( _vector[0] * _vector[0] +
- _vector[1] * _vector[1] +
- _vector[2] * _vector[2] )
-
- _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
- _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
- _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
-
- _ptr[0] = <unsigned char> (_vector[0] * 255)
- _ptr[1] = <unsigned char> (_vector[1] * 255)
- _ptr[2] = <unsigned char> (_vector[2] * 255)
- _ptr = _ptr + 3
-
-
- #-Z
- for j from 0 < j <= 32:
- for i from 0 < i <= 32:
- _vector[0] = -(i + 0.5 - 16.0)
- _vector[1] = -(j + 0.5 - 16.0)
- _vector[2] = -16.0
-
- _length = stdlib.sqrtf( _vector[0] * _vector[0] +
- _vector[1] * _vector[1] +
- _vector[2] * _vector[2] )
-
- _vector[0] = 0.5 * (_vector[0] / _length) + 0.5
- _vector[1] = 0.5 * (_vector[1] / _length) + 0.5
- _vector[2] = 0.5 * (_vector[2] / _length) + 0.5
-
- _ptr[0] = <unsigned char> (_vector[0] * 255)
- _ptr[1] = <unsigned char> (_vector[1] * 255)
- _ptr[2] = <unsigned char> (_vector[2] * 255)
- _ptr = _ptr + 3
-
- '''
- gl.glTexParameteri(self._target, gl.GL_TEXTURE_MAG_FILTER, gl.GL_LINEAR)
- gl.glTexParameteri(self._target, gl.GL_TEXTURE_MIN_FILTER, gl.GL_LINEAR)
- gl.glTexParameteri(self._target, gl.GL_TEXTURE_WRAP_S ,
gl.GL_CLAMP_TO_EDGE)
- gl.glTexParameteri(self._target, gl.GL_TEXTURE_WRAP_T ,
gl.GL_CLAMP_TO_EDGE)
- gl.glTexParameteri(self._target, gl.GL_TEXTURE_WRAP_R ,
gl.GL_CLAMP_TO_EDGE)
- '''
Modified: trunk/pysoy/src/textures/soy.textures.pyx
===================================================================
--- trunk/pysoy/src/textures/soy.textures.pyx 2008-05-20 04:40:38 UTC (rev
1285)
+++ trunk/pysoy/src/textures/soy.textures.pyx 2008-05-20 04:55:21 UTC (rev
1286)
@@ -23,5 +23,3 @@
include "Image.pym"
include "Video.pym"
include "Print.pym"
-include "NormalisationCubeMap.pym"
-
_______________________________________________
PySoy-SVN mailing list
PySoy-SVN@pysoy.org
http://www.pysoy.org/mailman/listinfo/pysoy-svn
