Changeset 1299 for trunk/pysoy/include

Timestamp:

05/23/08 02:49:01 (6 months ago)

Author:

ArcRiley

Message:

Ticket #955 :

• added fabs to math.pxd
  
• removed soy.materials.Animated
  
• added .animate property to soy.textures.Texture
  
• added AnimBlock?.py example — oooh pretty!!
  

Location:

trunk/pysoy/include

Files:

• math.pxd (modified) (1 diff)
• soy.materials.pxd (modified) (1 diff)
• soy.textures.pxd (modified) (3 diffs)

trunk/pysoy/include/math.pxd

@@ -19 +19 @@
 
 cdef extern from "math.h" nogil :
-  long int lround  (double x)
-  long int lroundf (float x)
-  float fabsf (float number)
+  long int         lround    ( double )
+  long int         lroundf   ( float )
+  double           fabs      ( double )
+  float            fabsf     ( float )

trunk/pysoy/include/soy.materials.pxd

@@ -42 +42 @@
   cdef soy.textures.Texture _colormap
   cdef soy.textures.Texture _glowmap
-
-cdef class Animated (Material) :
-  cdef float                _animateX
-  cdef float                _animateY
-  cdef float                _animateZ

trunk/pysoy/include/soy.textures.pxd

@@ -20 +20 @@
 cimport gl
 cimport py
+cimport math
 cimport ogg
 cimport cairo
@@ -35 +36 @@
   cdef gl.GLsizei   _height
   cdef gl.GLsizei   _depth
+  cdef int          _isAnimated
+  cdef gl.GLfloat   _animate[3]
   cdef gl.GLfloat   _scaleX
   cdef gl.GLfloat   _scaleY
@@ -42 +45 @@
   cdef gl.GLubyte  *_texels
   # Lookup Arrays
-  cdef int          _types[3]
+  cdef int          _types[5]
   cdef int          _formats[5]
   # General C functions