update examples

Author: electronstudio

examples/audio/audio_module_playing.py

@@ -6,39 +6,18 @@
 import dataclasses
 import pyray
 import raylib as rl
-from raylib.colors import (
-    RAYWHITE,
-    ORANGE,
-    RED,
-    GOLD,
-    LIME,
-    BLUE,
-    VIOLET,
-    BROWN,
-    LIGHTGRAY,
-    PINK,
-    YELLOW,
-    GREEN,
-    SKYBLUE,
-    PURPLE,
-    BEIGE,
-    MAROON,
-    GRAY,
-    BLACK
-)
 
 
 MAX_CIRCLES=64
 
 
 @dataclasses.dataclass
 class CircleWave:
-    position: 'rl.Vector2'
+    position: pyray.Vector2
     radius: float
     alpha: float
     speed: float
-    color: 'rl.Color'
-
+    color: pyray.Color
 
 screenWidth = 800
 screenHeight = 450
@@ -49,8 +28,8 @@ class CircleWave:
 
 rl.InitAudioDevice()                  # Initialize audio device
 
-colors = [ ORANGE, RED, GOLD, LIME, BLUE, VIOLET, BROWN, LIGHTGRAY, PINK,
-           YELLOW, GREEN, SKYBLUE, PURPLE, BEIGE ]
+colors = [pyray.ORANGE, pyray.RED, pyray.GOLD, pyray.LIME, pyray.BLUE, pyray.VIOLET, pyray.BROWN, pyray.LIGHTGRAY, pyray.PINK,
+          pyray.YELLOW, pyray.GREEN, pyray.SKYBLUE, pyray.PURPLE, pyray.BEIGE]
 
 # Creates some circles for visual effect
 circles = []
@@ -141,23 +120,23 @@ class CircleWave:
     #----------------------------------------------------------------------------------
     pyray.begin_drawing()
 
-    pyray.clear_background(RAYWHITE)
+    pyray.clear_background(pyray.RAYWHITE)
 
     for i in range(MAX_CIRCLES):
-        pyray.draw_circle_v(circles[i].position, circles[i].radius, rl.Fade(circles[i].color, circles[i].alpha))
+        pyray.draw_circle_v(circles[i].position, circles[i].radius, pyray.fade(circles[i].color, circles[i].alpha))
 
     # Draw time bar
-    pyray.draw_rectangle(20, screenHeight - 20 - 12, screenWidth - 40, 12, LIGHTGRAY)
-    pyray.draw_rectangle(20, screenHeight - 20 - 12, int(timePlayed), 12, MAROON)
-    pyray.draw_rectangle_lines(20, screenHeight - 20 - 12, screenWidth - 40, 12, GRAY)
+    pyray.draw_rectangle(20, screenHeight - 20 - 12, screenWidth - 40, 12, pyray.LIGHTGRAY)
+    pyray.draw_rectangle(20, screenHeight - 20 - 12, int(timePlayed), 12, pyray.MAROON)
+    pyray.draw_rectangle_lines(20, screenHeight - 20 - 12, screenWidth - 40, 12, pyray.GRAY)
 
     # Draw help instructions
-    pyray.draw_rectangle(20, 20, 425, 145, RAYWHITE)
-    pyray.draw_rectangle_lines(20, 20, 425, 145, GRAY)
-    pyray.draw_text("PRESS SPACE TO RESTART MUSIC", 40, 40, 20, BLACK)
-    pyray.draw_text("PRESS P TO PAUSE/RESUME", 40, 70, 20, BLACK)
-    pyray.draw_text("PRESS UP/DOWN TO CHANGE SPEED", 40, 100, 20, BLACK)
-    pyray.draw_text(f"SPEED: {pitch}", 40, 130, 20, MAROON)
+    pyray.draw_rectangle(20, 20, 425, 145, pyray.RAYWHITE)
+    pyray.draw_rectangle_lines(20, 20, 425, 145, pyray.GRAY)
+    pyray.draw_text("PRESS SPACE TO RESTART MUSIC", 40, 40, 20, pyray.BLACK)
+    pyray.draw_text("PRESS P TO PAUSE/RESUME", 40, 70, 20, pyray.BLACK)
+    pyray.draw_text("PRESS UP/DOWN TO CHANGE SPEED", 40, 100, 20, pyray.BLACK)
+    pyray.draw_text(f"SPEED: {pitch}", 40, 130, 20, pyray.MAROON)
 
     pyray.end_drawing()
     #----------------------------------------------------------------------------------

examples/core/core_2d_camera.py

@@ -57,18 +57,18 @@
     # Update
 
     # Player movement
-    if pyray.is_key_down(pyray.KEY_RIGHT):
+    if pyray.is_key_down(pyray.KeyboardKey.KEY_RIGHT):
         player.x += 2
-    elif pyray.is_key_down(pyray.KEY_LEFT):
+    elif pyray.is_key_down(pyray.KeyboardKey.KEY_LEFT):
         player.x -= 2
 
     # Camera target follows player
     camera.target = pyray.Vector2(player.x + 20, player.y + 20)
 
     # Camera rotation controls
-    if pyray.is_key_down(pyray.KEY_A):
+    if pyray.is_key_down(pyray.KeyboardKey.KEY_A):
         camera.rotation -= 1
-    elif pyray.is_key_down(pyray.KEY_S):
+    elif pyray.is_key_down(pyray.KeyboardKey.KEY_S):
         camera.rotation += 1
 
     # Limit camera rotation to 80 degrees (-40 to 40)
@@ -86,7 +86,7 @@
         camera.zoom = 0.1
 
     # Camera reset (zoom and rotation)
-    if pyray.is_key_pressed(pyray.KEY_R):
+    if pyray.is_key_pressed(pyray.KeyboardKey.KEY_R):
         camera.zoom = 1.0
         camera.rotation = 0.0
 

examples/core/core_2d_camera_mouse_zoom.py

@@ -13,15 +13,14 @@
 
 camera = pyray.Camera2D()
 
-camera = pyray.Camera2D()
 camera.zoom = 1.0
 
-pyray.set_target_fps(60); 
+pyray.set_target_fps(60)
 
 # main game loop
 while not pyray.window_should_close():   
     # update
-    if pyray.is_mouse_button_down(pyray.MOUSE_BUTTON_RIGHT):
+    if pyray.is_mouse_button_down(pyray.MouseButton.MOUSE_BUTTON_RIGHT):
         delta = pyray.get_mouse_delta()
         delta = pyray.vector2_scale(delta, -1.0 / camera.zoom)
         camera.target = pyray.vector2_add(camera.target, delta)
@@ -58,7 +57,7 @@
 
     pyray.end_mode_2d()
 
-    pyray.draw_text("Mouse right button drag to move, mouse wheel to zoom", 10, 10, 20, pyray.WHITE);
+    pyray.draw_text("Mouse right button drag to move, mouse wheel to zoom", 10, 10, 20, pyray.WHITE)
 
     pyray.end_drawing()
 

examples/core/core_2d_camera_platformer.py

@@ -62,11 +62,11 @@ def __init__(self, rect, blocking, color):
 
 
 def update_player(player, env_items, delta):
-    if pyray.is_key_down(pyray.KEY_LEFT):
+    if pyray.is_key_down(pyray.KeyboardKey.KEY_LEFT):
         player.position.x -= PLAYER_HOR_SPD * delta
-    if pyray.is_key_down(pyray.KEY_RIGHT):
+    if pyray.is_key_down(pyray.KeyboardKey.KEY_RIGHT):
         player.position.x += PLAYER_HOR_SPD * delta
-    if pyray.is_key_down(pyray.KEY_SPACE) and player.can_jump:
+    if pyray.is_key_down(pyray.KeyboardKey.KEY_SPACE) and player.can_jump:
         player.speed = -PLAYER_JUMP_SPD
         player.can_jump = False
 
@@ -264,11 +264,11 @@ def update_camera_player_bounds_push(
     elif camera.zoom < 0.25:
         camera.zoom = 0.25
 
-    if pyray.is_key_pressed(pyray.KEY_R):
+    if pyray.is_key_pressed(pyray.KeyboardKey.KEY_R):
         camera.zoom = 1.0
         player.position = pyray.Vector2(400, 280)
 
-    if pyray.is_key_pressed(pyray.KEY_C):
+    if pyray.is_key_pressed(pyray.KeyboardKey.KEY_C):
         camera_option = (camera_option + 1) % camera_updaters_length
 
     # Call update camera function by its pointer

examples/core/core_3d_camera_first_person_incomplete.py

@@ -10,32 +10,32 @@
 SCREEN_WIDTH = 800
 SCREEN_HEIGHT = 450
 
-pyray.init_window(SCREEN_WIDTH, SCREEN_HEIGHT, b"raylib [core] example - 3d camera first person")
+pyray.init_window(SCREEN_WIDTH, SCREEN_HEIGHT, "raylib [core] example - 3d camera first person")
 
 # Define the camera to look into our 3d world (position, target, up vector)
 camera = pyray.Camera3D()
 camera.position = pyray.Vector3(4.0, 2.0, 4.0)
 camera.target = pyray.Vector3(0.0, 1.8, 0.0)
 camera.up = pyray.Vector3(0.0, 1.0, 0.0)
 camera.fovy = 60.0
-camera.projection = pyray.CAMERA_PERSPECTIVE
+camera.projection = pyray.CameraProjection.CAMERA_PERSPECTIVE
 
 # Generates some random columns
-heights = [None] * MAX_COLUMNS
-positions = [None] * MAX_COLUMNS
-colors = [None] * MAX_COLUMNS
+heights = []
+positions = []
+colors = []
 
 for i in range(MAX_COLUMNS):
-    heights[i] = pyray.get_random_value(1, 12) * 1.0
-    positions[i] = pyray.Vector3(pyray.get_random_value(-15, 15) * 1.0, heights[i]/2.0 * 1.0, pyray.get_random_value(-15, 15) * 1.0)
-    colors[i] = pyray.Color(pyray.get_random_value(20, 255), pyray.get_random_value(10, 55), 30, 255)
+    heights.append(pyray.get_random_value(1, 12) * 1.0)
+    positions.append(pyray.Vector3(pyray.get_random_value(-15, 15) * 1.0, heights[i]/2.0 * 1.0, pyray.get_random_value(-15, 15) * 1.0))
+    colors.append(pyray.Color(pyray.get_random_value(20, 255), pyray.get_random_value(10, 55), 30, 255))
 
 
 pyray.set_target_fps(60)                
 
 while not pyray.window_should_close():
 
-    pyray.update_camera(camera, pyray.CAMERA_FIRST_PERSON)
+    pyray.update_camera(camera, pyray.CameraMode.CAMERA_FIRST_PERSON)
 
     pyray.begin_drawing()
 

examples/core/core_3d_camera_free_incomplete.py

@@ -25,7 +25,7 @@
     # Update
     update_camera(camera, CameraMode.CAMERA_FREE)
 
-    if is_key_pressed(KEY_Z):
+    if is_key_pressed(KeyboardKey.KEY_Z):
         camera.target = Vector3(0.0, 0.0, 0.0)
 
     # Draw

examples/core/core_3d_camera_mode.py

@@ -40,7 +40,7 @@
 
     pyray.end_mode_3d()
 
-    pyray.draw_text("Welcome to the third dimension!", 10, 40, 20, pyray.DARKGRAY);
+    pyray.draw_text("Welcome to the third dimension!", 10, 40, 20, pyray.DARKGRAY)
 
     pyray.draw_fps(10, 10)
 

examples/core/core_basic_screen_manager.py

@@ -27,13 +27,13 @@ def main():
             if frame_count > 120:
                 current_screen = GameScreen.TITLE
         elif current_screen == GameScreen.TITLE:
-            if is_key_pressed(KEY_ENTER) or is_gesture_detected(GESTURE_TAP):
+            if is_key_pressed(KeyboardKey.KEY_ENTER) or is_gesture_detected(Gesture.GESTURE_TAP):
                 current_screen = GameScreen.GAMEPLAY
         elif current_screen == GameScreen.GAMEPLAY:
-            if is_key_pressed(KEY_ENTER) or is_gesture_detected(GESTURE_TAP):
+            if is_key_pressed(KeyboardKey.KEY_ENTER) or is_gesture_detected(Gesture.GESTURE_TAP):
                 current_screen = GameScreen.ENDING
         elif current_screen == GameScreen.ENDING:
-            if is_key_pressed(KEY_ENTER) or is_gesture_detected(GESTURE_TAP):
+            if is_key_pressed(KeyboardKey.KEY_ENTER) or is_gesture_detected(Gesture.GESTURE_TAP):
                 current_screen = GameScreen.TITLE
 
         begin_drawing()

examples/core/core_drop_files.py

@@ -11,12 +11,6 @@
 
 """
 import pyray
-from raylib.colors import (
-    RAYWHITE,
-    DARKGRAY,
-    LIGHTGRAY,
-    GRAY
-)
 
 screenWidth = 800
 screenHeight = 450
@@ -36,21 +30,21 @@
 
     pyray.begin_drawing()
 
-    pyray.clear_background(RAYWHITE)
+    pyray.clear_background(pyray.RAYWHITE)
 
     if droppedFiles.count == 0:
-        pyray.draw_text("Drop your files to this window!", 100, 40, 20, DARKGRAY)
+        pyray.draw_text("Drop your files to this window!", 100, 40, 20, pyray.DARKGRAY)
     else:
-        pyray.draw_text("Dropped files:", 100, 40, 20, DARKGRAY)
+        pyray.draw_text("Dropped files:", 100, 40, 20, pyray.DARKGRAY)
 
     for i in range(0, droppedFiles.count):
         if i % 2 == 0:
-            pyray.draw_rectangle(0, 85 + 40*i, screenWidth, 40, pyray.fade(LIGHTGRAY, 0.5))
+            pyray.draw_rectangle(0, 85 + 40*i, screenWidth, 40, pyray.fade(pyray.LIGHTGRAY, 0.5))
         else:
-            pyray.draw_rectangle(0, 85 + 40*i, screenWidth, 40, pyray.fade(LIGHTGRAY, 0.3))
-        pyray.draw_text(droppedFiles.paths[i], 120, 100 + 40*i, 10, GRAY)
+            pyray.draw_rectangle(0, 85 + 40*i, screenWidth, 40, pyray.fade(pyray.LIGHTGRAY, 0.3))
+        pyray.draw_text(droppedFiles.paths[i], 120, 100 + 40*i, 10, pyray.GRAY)
 
-    pyray.draw_text("Drop new files...", 100, 110 + 40*droppedFiles.count, 20, DARKGRAY)
+    pyray.draw_text("Drop new files...", 100, 110 + 40*droppedFiles.count, 20, pyray.DARKGRAY)
     pyray.end_drawing()
 
 # De-Initialization

examples/core/core_input_gestures.py

@@ -4,13 +4,6 @@
 
 """
 import pyray
-from raylib.colors import (
-    RAYWHITE,
-    LIGHTGRAY,
-    DARKGRAY,
-    MAROON,
-    GRAY,
-)
 
 
 
@@ -26,20 +19,20 @@
 
 gesture_strings = []
 
-current_gesture = pyray.GESTURE_NONE
-last_gesture = pyray.GESTURE_NONE
+current_gesture = pyray.Gesture.GESTURE_NONE
+last_gesture = pyray.Gesture.GESTURE_NONE
 
 GESTURE_LABELS = {
-    pyray.GESTURE_TAP: 'GESTURE TAP',
-    pyray.GESTURE_DOUBLETAP: 'GESTURE DOUBLETAP',
-    pyray.GESTURE_HOLD: 'GESTURE HOLD',
-    pyray.GESTURE_DRAG: 'GESTURE DRAG',
-    pyray.GESTURE_SWIPE_RIGHT: 'GESTURE SWIPE RIGHT',
-    pyray.GESTURE_SWIPE_LEFT: 'GESTURE SWIPE LEFT',
-    pyray.GESTURE_SWIPE_UP: 'GESTURE SWIPE UP',
-    pyray.GESTURE_SWIPE_DOWN: 'GESTURE SWIPE DOWN',
-    pyray.GESTURE_PINCH_IN: 'GESTURE PINCH IN',
-    pyray.GESTURE_PINCH_OUT: 'GESTURE PINCH OUT',
+    pyray.Gesture.GESTURE_TAP: 'GESTURE TAP',
+    pyray.Gesture.GESTURE_DOUBLETAP: 'GESTURE DOUBLETAP',
+    pyray.Gesture.GESTURE_HOLD: 'GESTURE HOLD',
+    pyray.Gesture.GESTURE_DRAG: 'GESTURE DRAG',
+    pyray.Gesture.GESTURE_SWIPE_RIGHT: 'GESTURE SWIPE RIGHT',
+    pyray.Gesture.GESTURE_SWIPE_LEFT: 'GESTURE SWIPE LEFT',
+    pyray.Gesture.GESTURE_SWIPE_UP: 'GESTURE SWIPE UP',
+    pyray.Gesture.GESTURE_SWIPE_DOWN: 'GESTURE SWIPE DOWN',
+    pyray.Gesture.GESTURE_PINCH_IN: 'GESTURE PINCH IN',
+    pyray.Gesture.GESTURE_PINCH_OUT: 'GESTURE PINCH OUT',
 }
 
 pyray.set_target_fps(60)  # Set our game to run at 60 frames-per-second
@@ -54,7 +47,7 @@
 
     if (
         pyray.check_collision_point_rec(touch_position, touch_area)
-        and current_gesture != pyray.GESTURE_NONE
+        and current_gesture != pyray.Gesture.GESTURE_NONE
     ):
         if current_gesture != last_gesture:
             gesture_strings.append(GESTURE_LABELS[current_gesture])
@@ -66,34 +59,34 @@
     # Draw
     pyray.begin_drawing()
 
-    pyray.clear_background(RAYWHITE)
+    pyray.clear_background(pyray.RAYWHITE)
 
-    pyray.draw_rectangle_rec(touch_area, GRAY)
+    pyray.draw_rectangle_rec(touch_area, pyray.GRAY)
     pyray.draw_rectangle(225, 15, SCREEN_WIDTH - 240, SCREEN_HEIGHT - 30,
-                         RAYWHITE)
+                         pyray.RAYWHITE)
     pyray.draw_text(
         'GESTURES TEST AREA',
-        SCREEN_WIDTH - 270, SCREEN_HEIGHT - 40, 20, pyray.fade(GRAY, 0.5)
+        SCREEN_WIDTH - 270, SCREEN_HEIGHT - 40, 20, pyray.fade(pyray.GRAY, 0.5)
     )
 
     for i, val in enumerate(gesture_strings):
         if i % 2 == 0:
             pyray.draw_rectangle(
-                10, 30 + 20 * i, 200, 20, pyray.fade(LIGHTGRAY, 0.5))
+                10, 30 + 20 * i, 200, 20, pyray.fade(pyray.LIGHTGRAY, 0.5))
         else:
             pyray.draw_rectangle(
-                10, 30 + 20 * i, 200, 20, pyray.fade(LIGHTGRAY, 0.3))
+                10, 30 + 20 * i, 200, 20, pyray.fade(pyray.LIGHTGRAY, 0.3))
 
         if i < len(gesture_strings) - 1:
-            pyray.draw_text(val, 35, 36 + 20 * i, 10, DARKGRAY)
+            pyray.draw_text(val, 35, 36 + 20 * i, 10, pyray.DARKGRAY)
         else:
-            pyray.draw_text(val, 35, 36 + 20 * i, 10, MAROON)
+            pyray.draw_text(val, 35, 36 + 20 * i, 10, pyray.MAROON)
 
-    pyray.draw_rectangle_lines(10, 29, 200, SCREEN_HEIGHT - 50, GRAY)
-    pyray.draw_text('DETECTED GESTURES', 50, 15, 10, GRAY)
+    pyray.draw_rectangle_lines(10, 29, 200, SCREEN_HEIGHT - 50, pyray.GRAY)
+    pyray.draw_text('DETECTED GESTURES', 50, 15, 10, pyray.GRAY)
 
-    if current_gesture != pyray.GESTURE_NONE:
-        pyray.draw_circle_v(touch_position, 30, MAROON)
+    if current_gesture != pyray.Gesture.GESTURE_NONE:
+        pyray.draw_circle_v(touch_position, 30, pyray.MAROON)
 
     pyray.end_drawing()