fix more examples #47

Author: electronstudio

examples/core/core_2d_camera.py

@@ -3,7 +3,8 @@
 raylib [core] example - 2d camera
 
 """
-from raylib.pyray import PyRay
+import pyray
+
 from raylib.colors import (
     RAYWHITE,
     DARKGRAY,
@@ -15,7 +16,7 @@
 )
 
 
-pyray = PyRay()
+
 
 # Initialization
 MAX_BUILDINGS = 100

examples/core/core_2d_camera_platformer.py

@@ -5,7 +5,7 @@
 """
 from math import sqrt
 
-from raylib.pyray import PyRay
+import pyray
 from raylib.colors import (
     DARKGRAY,
     RED,
@@ -15,7 +15,6 @@
 )
 
 
-pyray = PyRay()
 
 # Initialization
 global g_evening_out, g_even_out_target

examples/core/core_basic_window.py

@@ -3,14 +3,14 @@
 raylib [core] example - Basic window
 
 """
-from raylib.pyray import PyRay
+import pyray
 from raylib.colors import (
     RAYWHITE,
     LIGHTGRAY,
 )
 
 
-pyray = PyRay()
+
 
 
 # Initialization

examples/core/core_input_gestures.py

@@ -3,7 +3,7 @@
 raylib [core] example - Input Gestures Detection
 
 """
-from raylib.pyray import PyRay
+import pyray
 from raylib.colors import (
     RAYWHITE,
     LIGHTGRAY,
@@ -13,7 +13,6 @@
 )
 
 
-pyray = PyRay()
 
 # Initialization
 MAX_GESTURE_STRINGS = 20

examples/core/core_input_keys.py

@@ -3,15 +3,14 @@
 raylib [core] example - Keyboard input
 
 """
-from raylib.pyray import PyRay
+import pyray
 from raylib.colors import (
     RAYWHITE,
     DARKGRAY,
     MAROON,
 )
 
 
-pyray = PyRay()
 
 
 # Initialization

examples/core/core_input_mouse.py

@@ -3,7 +3,7 @@
 raylib [core] example - Mouse input
 
 """
-from raylib.pyray import PyRay
+import pyray
 from raylib.colors import (
     RAYWHITE,
     DARKGRAY,
@@ -13,7 +13,6 @@
 )
 
 
-pyray = PyRay()
 
 
 # Initialization
@@ -34,11 +33,11 @@
     # Update
     ball_position = pyray.get_mouse_position()
 
-    if pyray.is_mouse_button_pressed(pyray.MOUSE_LEFT_BUTTON):
+    if pyray.is_mouse_button_pressed(pyray.MOUSE_BUTTON_LEFT):
         ball_color = MAROON
-    elif pyray.is_mouse_button_pressed(pyray.MOUSE_MIDDLE_BUTTON):
+    elif pyray.is_mouse_button_pressed(pyray.MOUSE_BUTTON_MIDDLE):
         ball_color = LIME
-    elif pyray.is_mouse_button_pressed(pyray.MOUSE_RIGHT_BUTTON):
+    elif pyray.is_mouse_button_pressed(pyray.MOUSE_BUTTON_RIGHT):
         ball_color = DARKBLUE
 
     # Draw

examples/core/core_input_mouse_wheel.py

@@ -3,7 +3,7 @@
 raylib [core] example - Mouse wheel input
 
 """
-from raylib.pyray import PyRay
+import pyray
 from raylib.colors import (
     RAYWHITE,
     GRAY,
@@ -12,7 +12,7 @@
 )
 
 
-pyray = PyRay()
+
 
 
 # Initialization
@@ -38,6 +38,8 @@
 
     pyray.clear_background(RAYWHITE)
 
+    # TODO
+    # FIXME
     pyray.draw_rectangle(
         SCREEN_WIDTH // 2 - 40, box_position_y, 80, 80, MAROON)
 

examples/extra/camera.py

@@ -1,6 +1,6 @@
 from math import sin, cos
 import glm
-from raylib.dynamic import raylib as rl, ffi
+from raylib import rl, ffi
 
 
 class CameraFly:

examples/extra/flow-field.py

@@ -9,7 +9,7 @@
 
 import sys, math, time, random
 import glm
-from raylib.dynamic import raylib as rl, ffi
+from raylib import rl, ffi
 from raylib.colors import *
 
 CTM = lambda: round(time.time() * 1000)

examples/textures/textures_bunnymark.py

@@ -47,7 +47,7 @@ def __init__(self):
 while not WindowShouldClose():    #// Detect window close button or ESC key
     #// Update
     #//----------------------------------------------------------------------------------
-    if IsMouseButtonDown(MOUSE_LEFT_BUTTON):
+    if IsMouseButtonDown(MOUSE_BUTTON_LEFT):
         #// Create more bunnies
         for i in range(0, 100):
             if bunniesCount < MAX_BUNNIES: