remove depreciated stuff, tidy build a bit for 4.0

Author: electronstudio

MANIFEST.in

@@ -6,3 +6,5 @@ include raylib/*.h
 include raylib/*.pyi
 exclude raylib/*.c
 exclude raylib/*.o
+include version.py
+

README.md

@@ -45,6 +45,12 @@ There is now a separate dynamic version of this binding:
 
 [Read this before using raylib_dynamic](https://electronstudio.github.io/raylib-python-cffi/dynamic.html)
 
+## Beta testing
+
+You can install an alpha or beta version by specifying the version number like this:
+
+    python3 -m pip install raylib==4.0a3
+
 
 # How to use
 

dynamic/test_dynamic.py

@@ -14,7 +14,7 @@
 mesh = rl.GenMeshHeightmap(image, [16, 8, 16])
 model = rl.LoadModelFromMesh(mesh)
 print(model.materials)  # SHOULD BE A pointer to a 'struct Material' but some is NULL pointer to 'Material' ?
-model.materials.maps[rl.MATERIAL_MAP_DIFFUSE].texture = texture
+model.materials.maps[rl.MATERIAL_MAP_ALBEDO].texture = texture
 
 rl.UnloadImage(image)
 rl.SetCameraMode(camera[0], rl.CAMERA_ORBITAL)

dynamic/test_pyray.py

@@ -16,7 +16,7 @@
 texture = pr.load_texture_from_image(image)
 mesh = pr.gen_mesh_heightmap(image, (16, 8, 16))
 model = pr.load_model_from_mesh(mesh)
-model.materials.maps[pr.MATERIAL_MAP_DIFFUSE].texture = texture
+model.materials.maps[pr.MATERIAL_MAP_ALBEDO].texture = texture
 
 pr.unload_image(image)
 pr.set_camera_mode(camera, pr.CAMERA_ORBITAL)

examples/models/models_cubicmap.py

@@ -30,7 +30,7 @@
 
 # NOTE: By default each cube is mapped to one part of texture atlas
 texture = LoadTexture(b"resources/cubicmap_atlas.png")    # Load map texture
-model.materials[0].maps[MATERIAL_MAP_DIFFUSE ].texture = texture                 # Set map diffuse texture
+model.materials[0].maps[MATERIAL_MAP_ALBEDO ].texture = texture                 # Set map diffuse texture
 
 mapPosition = [ -16.0, 0.0, -8.0 ]          # Set model position
 

examples/models/models_heightmap.py

@@ -27,7 +27,7 @@
 mesh = GenMeshHeightmap(image, ( 16, 8, 16 ))    # Generate heightmap mesh (RAM and VRAM)
 model = LoadModelFromMesh(mesh)                         # Load model from generated mesh
 
-model.materials[0].maps[MATERIAL_MAP_DIFFUSE].texture = texture        # Set map diffuse texture
+model.materials[0].maps[MATERIAL_MAP_ALBEDO].texture = texture        # Set map diffuse texture
 mapPosition = ( -8.0, 0.0, -8.0 )                # Define model position
 
 UnloadImage(image)                     # Unload heightmap image from RAM, already uploaded to VRAM

examples/models/models_obj_loading.py

@@ -30,7 +30,7 @@
 
 model = LoadModel(b"resources/models/house.obj")                 # Load OBJ model
 texture = LoadTexture(b"resources/models/house_diffuse.png") # Load model texture
-model.materials.maps[MATERIAL_MAP_DIFFUSE].texture = texture                     # Set map diffuse texture
+model.materials.maps[MATERIAL_MAP_ALBEDO].texture = texture                     # Set map diffuse texture
 position = [ 0.0, 0.0, 0.0 ]                                # Set model position
 
 SetTargetFPS(60)   # Set our game to run at 60 frames-per-second

raylib/build.py

@@ -22,14 +22,14 @@
 import platform
 import sys
 
-
 ffibuilder = FFI()
 
+
 def mangle(file):
     result = ""
     skip = False
     for line in open(file):
-        line = line.strip().replace("va_list", "void *")+"\n"
+        line = line.strip().replace("va_list", "void *") + "\n"
         if skip:
             if line.startswith("#endif"):
                 skip = False
@@ -50,16 +50,14 @@ def mangle(file):
         if line.startswith("PHYSACDEF"):
             line = line.replace('PHYSACDEF ', '')
         result += line
-        print(line)
+        # print(line)
     return result
 
 
 def build_linux():
     print("BUILDING FOR LINUX")
-    ffibuilder.cdef(mangle("raylib/raylib.h"))
-    #ffibuilder.cdef(mangle("raylib/raygui.h"))
+    ffibuilder.cdef(mangle("/usr/local/include/raylib.h"))
     ffibuilder.cdef(open("raylib/raygui_modified.h").read().replace('RAYGUIDEF ', ''))
-    #ffibuilder.cdef(mangle("raylib/physac.h"))
     ffibuilder.cdef(open("raylib/physac_modified.h").read().replace('PHYSACDEF ', ''))
     ffibuilder.set_source("raylib._raylib_cffi",
                           """
@@ -70,18 +68,20 @@ def build_linux():
                                #define PHYSAC_IMPLEMENTATION
                                #include "physac.h"
                           """,
-                          extra_link_args=['/usr/local/lib/libraylib.a','-lm', '-lpthread', '-lGLU', '-lGL',  '-lrt', '-lm', '-ldl', '-lX11', '-lpthread'],
-                          libraries=['GL','m','pthread', 'dl', 'rt', 'X11'],
+                          extra_link_args=['/usr/local/lib/libraylib.a', '-lm', '-lpthread', '-lGLU', '-lGL', '-lrt',
+                                           '-lm', '-ldl', '-lX11', '-lpthread'],
+                          libraries=['GL', 'm', 'pthread', 'dl', 'rt', 'X11'],
                           include_dirs=['raylib']
                           )
     if __name__ == "__main__":
         ffibuilder.compile(verbose=True)
 
+
 def build_windows():
     print("BUILDING FOR WINDOWS")
-    ffibuilder.cdef(mangle("raylib/raylib.h"))
-    ffibuilder.cdef(open("raylib/raygui_modified.h").read().replace('RAYGUIDEF ', '').replace('bool','int'))
-    ffibuilder.cdef(open("raylib/physac_modified.h").read().replace('PHYSACDEF ', '').replace('bool','int'))
+    ffibuilder.cdef(mangle("raylib/raylib.h").replace('bool', 'int'))
+    ffibuilder.cdef(open("raylib/raygui_modified.h").read().replace('RAYGUIDEF ', '').replace('bool', 'int'))
+    ffibuilder.cdef(open("raylib/physac_modified.h").read().replace('PHYSACDEF ', '').replace('bool', 'int'))
     ffibuilder.set_source("raylib._raylib_cffi",
                           """
                                #include "raylib.h"
@@ -92,20 +92,31 @@ def build_windows():
                                #include "physac.h" 
                           """,
                           extra_link_args=['/NODEFAULTLIB:MSVCRTD'],
-                          libraries=['raylib', 'gdi32', 'shell32', 'user32','OpenGL32', 'winmm'],
+                          libraries=['raylib', 'gdi32', 'shell32', 'user32', 'OpenGL32', 'winmm'],
                           include_dirs=['raylib'],
                           )
     if __name__ == "__main__":
         ffibuilder.compile(verbose=True)
 
+
 def build_mac():
     print("BUILDING FOR MAC")
-    ffibuilder.cdef(open("raylib/raylib_modified.h").read().replace('RLAPI ', ''))
+    ffibuilder.cdef(mangle("/usr/local/include/raylib.h"))
+    ffibuilder.cdef(open("raylib/raygui_modified.h").read().replace('RAYGUIDEF ', ''))
+    ffibuilder.cdef(open("raylib/physac_modified.h").read().replace('PHYSACDEF ', ''))
     ffibuilder.set_source("raylib._raylib_cffi",
                           """
-                               #include "../../raylib/raylib.h"   // the C header of the library, supplied by us here
+                               #include "raylib.h"
+                               #define RAYGUI_IMPLEMENTATION
+                               #define RAYGUI_SUPPORT_RICONS
+                               #include "raygui.h"
+                               #define PHYSAC_IMPLEMENTATION
+                               #include "physac.h"
                           """,
-                          extra_link_args=['/usr/local/lib/libraylib.a', '-framework', 'OpenGL', '-framework', 'Cocoa', '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework', 'CoreVideo'],
+                          extra_link_args=['/usr/local/lib/libraylib.a', '-framework', 'OpenGL', '-framework', 'Cocoa',
+                                           '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',
+                                           'CoreVideo'],
+                          include_dirs=['raylib'],
                           )
 
     if __name__ == "__main__":
@@ -114,32 +125,38 @@ def build_mac():
 
 def build_rpi_nox():
     print("BUILDING FOR RASPBERRY PI")
-    ffibuilder.cdef(mangle("raylib/raylib.h"))
+    ffibuilder.cdef(mangle("/usr/local/include/raylib.h"))
+    ffibuilder.cdef(open("raylib/raygui_modified.h").read().replace('RAYGUIDEF ', ''))
+    ffibuilder.cdef(open("raylib/physac_modified.h").read().replace('PHYSACDEF ', ''))
     ffibuilder.set_source("raylib._raylib_cffi",
                           """
-                               #include "../../raylib/raylib.h"
+                            #include "raylib.h"
+                            #define RAYGUI_IMPLEMENTATION
+                            #define RAYGUI_SUPPORT_RICONS
+                            #include "raygui.h"
+                            #define PHYSAC_IMPLEMENTATION
+                            #include "physac.h"
                           """,
                           extra_link_args=['/usr/local/lib/libraylib.a',
                                            '/opt/vc/lib/libEGL_static.a', '/opt/vc/lib/libGLESv2_static.a',
                                            '-L/opt/vc/lib', '-lvcos', '-lbcm_host', '-lbrcmEGL', '-lbrcmGLESv2',
                                            '-lm', '-lpthread', '-lrt'],
+                          include_dirs=['raylib'],
                           )
 
-
     if __name__ == "__main__":
         ffibuilder.compile(verbose=True)
 
 
-
-if platform.system()=="Darwin":
+if platform.system() == "Darwin":
     build_mac()
-elif platform.system()=="Linux":
+elif platform.system() == "Linux":
     if "x86" in platform.machine():
         build_linux()
     elif "arm" in platform.machine():
         build_rpi_nox()
-elif platform.system()=="Windows":
+elif platform.system() == "Windows":
     build_windows()
 else:
     print("WARNING: UKKNOWN PLATFORM - trying Linux build")
-    build_linux()
+    build_linux()

raylib/pyray.py

@@ -1,13 +1,15 @@
 import pathlib
 from setuptools import setup
 from setuptools.dist import Distribution
-from version import __version__
+
 
 # The directory containing this file
 HERE = pathlib.Path(__file__).parent
 
 # The text of the README file
 README = (HERE / "README.md").read_text()
+VERSION = (HERE / "version.py").read_text().split()[-1].strip("\"'")
+
 
 class BinaryDistribution(Distribution):
     """Distribution which always forces a binary package with platform name"""
@@ -17,7 +19,7 @@ def has_ext_modules(foo):
 # This call to setup() does all the work
 setup(
     name="raylib",
-    version=__version__,
+    version=VERSION,
     description="Python CFFI bindings for Raylib",
     long_description=README,
     long_description_content_type="text/markdown",