Merge remote branch 'origin/master'

data/themes/MegaLight GH3/rockmeter.ini

@@ -1,11 +1,11 @@
-[layer1]
+[layer1:Image]
 texture = dotbase.png
 xpos = .0425
 ypos = .12
 xscale = .5
 yscale = -.5
 
-[layer2]
+[layer2:Image]
 texture = dots.png
 
 [layer2:fx0]
@@ -17,7 +17,7 @@ yscale = -.5
 angle = 0
 multdiv = True
 
-[layer3]
+[layer3:Image]
 texture = mult.png
 
 [layer3:fx0]
@@ -27,14 +27,14 @@ ypos = 0.19
 xscale = .5
 yscale = -.5
 
-[layer4]
+[layer4:Image]
 texture = rockmeter.png
 xpos = .134
 ypos = .22
 xscale = .5
 yscale = -.5
 
-[layer5]
+[layer5:Image]
 texture = splight.png
 issplights = True
 xstatic = 0.772, 0.795, 0.822
@@ -43,10 +43,10 @@ xstart = 0.841680344, 0.841680344, 0.851971546
 xend = 0.867126494, 0.902359625, 0.943112688
 ystart = 0.202291056, 0.205626286, 0.20994647
 yend = 0.34490625, 0.333114583, 0.302322917
-angle = .87, .58, .37, 0, -.34, -.70
+;angle = 0.87, 0.58, 0.37, 0.00, -0.34, -0.70
 scale = 23.0000, 32.0000
 
-[layer6]
+[layer6:Image]
 texture = rock_med.png
 
 [layer6:fx0]
@@ -57,7 +57,7 @@ ypos = .2
 xscale = .5
 yscale = -.5
 
-[layer7]
+[layer7:Image]
 texture = rock_arr.png
 
 [layer7:fx0]
@@ -68,33 +68,33 @@ xscale = .5
 yscale = -.5
 angle = -(.460 / 2) * math.pi + .460 * math.pi * self.arrowRotation
 
-[layer8]
+[layer8:Image]
 texture = counter.png
 xpos = .15
 ypos = .1125
 xscale = .5
 yscale = -.5
 
-[layer9]
+[layer9:Text]
 text = streak%10
 font = streakFont
 xpos = 0.193-wid/2
 ypos = 0.667-hgt/2
 color = #000000
 
-[layer10]
+[layer10:Text]
 text = (streak%100-streak%10)/10
 font = streakFont
 xpos = .161-wid/2
 ypos =  0.667-hgt/2
 
-[layer11]
+[layer11:Text]
 text = (streak%1000-streak%100)/100
 font = streakFont
 xpos = .132-wid/2
 ypos =  0.667-hgt/2
 
-[layer12]
+[layer12:Text]
 text = score
 font = scoreFont
 xpos = 0.19-wid

doc/RunningFromSource.mkd

@@ -134,10 +134,10 @@ Python installation.
 The following packages are required:
 
   * PyWin32 ([direct link to build 214](http://downloads.sourceforge.net/pywin32/pywin32-214.win32-py2.6.exe))
-  * numpy ([direct link to 1.4.1](http://download.sourceforge.net/numpy/numpy-1.4.1-win32-superpack-python2.6.exe))
+  * numpy ([direct link to 1.5.0](http://download.sourceforge.net/numpy/numpy-1.5.0-win32-superpack-python2.6.exe))
   * pygame ([direct link to 1.9.1](http://pygame.org/ftp/pygame-1.9.1.win32-py2.6.msi))
   * PyOpenGL ([direct link to 3.0.1](http://pypi.python.org/packages/any/P/PyOpenGL/PyOpenGL-3.0.1.win32.exe))
-  * Python Imaging Library ([direct link to 1.1.7](http://effbot.org/downloads/PIL-1.1.7.win32-py2.6.exe))
+  * Python Imaging Library ([direct link to 1.1.7+](http://github.com/downloads/fuzion/pil-2009-raclette/PIL-1.1.7-2009-raclette-r358.win32-py2.6.exe))
   * pyogg ([direct link to 1.3](http://www.mediafire.com/file/qlw2hwyy0rz/pyogg-1.3.win32-py2.6.exe))
   * pyvorbis ([direct link to 1.5a](http://www.mediafire.com/file/i21ewawljtw/pyvorbis-1.5.win32-py2.6.exe))
   * Cython ([direct link to 0.12.1](http://www.lfd.uci.edu/~gohlke/pythonlibs/Cython-0.12.1.win32-py2.6.exe))
@@ -155,7 +155,7 @@ The following packages are optional:
 
     This allows you to use MIDI instruments for controller input.
 
-  * pyopengl-accelerate ([direct link to 3.0.1](http://pypi.python.org/packages/2.6/P/PyOpenGL-accelerate/PyOpenGL-accelerate-3.0.1.win32-py2.6.exe))
+  * pyopengl-accelerate ([direct link to 3.0.1-r365](http://github.com/downloads/fuzion/pil-2009-raclette/PyOpenGL-accelerate-3.0.1-r365.win32-py2.6.exe))
 
     This will make PyOpenGL go a good bit faster. _Highly recommended!_
 

src/Drum.py

@@ -34,6 +34,7 @@
 from Shader import shaders
 
 from OpenGL.GL import *
+import numpy as np
 import math
 
 #myfingershurt: needed for multi-OS file fetching
@@ -1112,9 +1113,9 @@ def renderFrets(self, visibility, song, controls):
           glEnable(GL_LIGHT0)
           glShadeModel(GL_SMOOTH)
           glRotatef(90, 0, 1, 0)
-          glLightfv(GL_LIGHT0, GL_POSITION, (5.0, 10.0, -10.0, 0.0))
-          glLightfv(GL_LIGHT0, GL_AMBIENT,  (.2, .2, .2, 0.0))
-          glLightfv(GL_LIGHT0, GL_DIFFUSE,  (1.0, 1.0, 1.0, 0.0))
+          glLightfv(GL_LIGHT0, GL_POSITION, np.array([5.0, 10.0, -10.0, 0.0], dtype=np.float32))
+          glLightfv(GL_LIGHT0, GL_AMBIENT,  np.array([.2, .2, .2, 0.0], dtype=np.float32))
+          glLightfv(GL_LIGHT0, GL_DIFFUSE,  np.array([1.0, 1.0, 1.0, 0.0], dtype=np.float32))
           glRotatef(-90, 1, 0, 0)
           glRotatef(-90, 0, 0, 1)
 
@@ -1242,9 +1243,9 @@ def renderFrets(self, visibility, song, controls):
         glEnable(GL_LIGHT0)
         glShadeModel(GL_SMOOTH)
         glRotatef(90, 0, 1, 0)
-        glLightfv(GL_LIGHT0, GL_POSITION, (5.0, 10.0, -10.0, 0.0))
-        glLightfv(GL_LIGHT0, GL_AMBIENT,  (.2, .2, .2, 0.0))
-        glLightfv(GL_LIGHT0, GL_DIFFUSE,  (1.0, 1.0, 1.0, 0.0))
+        glLightfv(GL_LIGHT0, GL_POSITION, np.array([5.0, 10.0, -10.0, 0.0], dtype=np.float32))
+        glLightfv(GL_LIGHT0, GL_AMBIENT,  np.array([.2, .2, .2, 0.0], dtype=np.float32))
+        glLightfv(GL_LIGHT0, GL_DIFFUSE,  np.array([1.0, 1.0, 1.0, 0.0], dtype=np.float32))
         glRotatef(-90, 1, 0, 0)
         glRotatef(-90, 0, 0, 1)
 

src/FoFiX.py

@@ -95,6 +95,11 @@ def _usage(errmsg=None):
   import OpenGL
   if OpenGL.__version__ >= '3':
     OpenGL.ERROR_CHECKING = False
+    OpenGL.ARRAY_SIZE_CHECKING = False
+    OpenGL.ERROR_ON_COPY = True
+    OpenGL.FORWARD_COMPATIBLE_ONLY = True
+    OpenGL.SIZE_1_ARRAY_UNPACK = False
+    OpenGL.STORE_POINTERS = False
 
 import Log
 import Config

src/Guitar.py

@@ -35,6 +35,7 @@
 
 from Instrument import *
 from OpenGL.GL import *
+import numpy as np
 import Song
 
 class Guitar(Instrument):
@@ -1173,9 +1174,9 @@ def renderFrets(self, visibility, song, controls):
           glEnable(GL_LIGHT0)
           glShadeModel(GL_SMOOTH)
           glRotatef(90, 0, 1, 0)
-          glLightfv(GL_LIGHT0, GL_POSITION, (5.0, 10.0, -10.0, 0.0))
-          glLightfv(GL_LIGHT0, GL_AMBIENT,  (.2, .2, .2, 0.0))
-          glLightfv(GL_LIGHT0, GL_DIFFUSE,  (1.0, 1.0, 1.0, 0.0))
+          glLightfv(GL_LIGHT0, GL_POSITION, np.array([5.0, 10.0, -10.0, 0.0], dtype=np.float32))
+          glLightfv(GL_LIGHT0, GL_AMBIENT,  np.array([0.2, 0.2, 0.2, 0.0], dtype=np.float32))
+          glLightfv(GL_LIGHT0, GL_DIFFUSE,  np.array([1.0, 1.0, 1.0, 0.0], dtype=np.float32))
 
 
           glRotatef(-90, 1, 0, 0)

src/Mesh.py

@@ -21,7 +21,7 @@
 #####################################################################
 from __future__ import with_statement
 from OpenGL.GL import *
-
+import numpy as np
 import Collada
 
 import cmgl
@@ -40,9 +40,9 @@ def setupLight(self, light, n, pos):
     l = light.techniqueCommon
     glEnable(GL_LIGHTING)
     glEnable(GL_LIGHT0 + n)
-    glLightfv(GL_LIGHT0 + n, GL_POSITION, (pos[0], pos[1], pos[2], 0.0))
-    glLightfv(GL_LIGHT0 + n, GL_DIFFUSE, (l.color[0], l.color[1], l.color[2], 0.0))
-    glLightfv(GL_LIGHT0 + n, GL_AMBIENT, (0.0, 0.0, 0.0, 0.0))
+    glLightfv(GL_LIGHT0 + n, GL_POSITION, np.array([pos[0], pos[1], pos[2], 0.0], dtype=np.float32))
+    glLightfv(GL_LIGHT0 + n, GL_DIFFUSE, np.array([l.color[0], l.color[1], l.color[2], 0.0], dtype=np.float32))
+    glLightfv(GL_LIGHT0 + n, GL_AMBIENT, np.array([0.0, 0.0, 0.0, 0.0], dtype=np.float32))
 
   def setupMaterial(self, material):
     for m in material.techniqueCommon.iMaterials: