Final workshop prep (#413)

* clean up

* strip for me daddy

* clean up

* remove controller from stripped

* cleanup

* step 1

* step 2 done

* Update step2.rst

* added step 3 support

* added step 3b

* clean up w/ martin

* quick fix

* updated for step 3b

* step 4 done.

* step 5 ready

* clean up and doing the tutorial myself.

* Update index_img.png

* delete tutorial follow along files.

* file update

* I want to get notified when u are PRing for .py

* revision and edits

* googify

* habibi

* okay

* step1-3

* step4 gooder

* emphAsis

* gog rst

* steps one through three done!

* omg its done

* step four googify

* step 5 googify

* remove custom components demo/tutorial

* final changes

* rename test folder

* oops

Co-authored-by: Martin Chaperot <martin.chapino@gmail.com>
Co-authored-by: Tomer Sedan <tomer.sedan@pm.me>

Author: 3 people

.github/CODEOWNERS

@@ -1 +1,2 @@
 * @tsedan @tinmarr
+*.py @mrElnekave

.vscode/settings.json

@@ -43,12 +43,7 @@
     "python.formatting.provider": "yapf",
     "python.linting.pylintCategorySeverity.refactor": "Information",
     "githubPullRequests.ignoredPrBranches": ["main"],
-    "python.linting.ignorePatterns": [
-        "**/site-packages/**/*.py",
-        ".vscode/*.py",
-        "demo/**/*",
-        "docs/**/*"
-    ],
+    "python.linting.ignorePatterns": ["**/site-packages/**/*.py", ".vscode/*.py", "demo/**/*", "docs/**/*"],
     "githubPullRequests.ignoredPullRequestBranches": ["main"],
     "files.associations": {
         "cstdint": "c",

b

@@ -96,7 +96,7 @@ doc() {
             ./b del -b
             ./b doc -c
             cd docs
-            sphinx-autobuild "$SOURCEDIR" "$BUILDDIR" -b $BUILDER $O --watch ../rubato
+            sphinx-autobuild "$SOURCEDIR" "$BUILDDIR" -b $BUILDER $O --watch ../
             cd ..
             if [[ -d build ]]
             then

demo/custom_components.py

@@ -1,8 +1,7 @@
 from rubato import Scene, Color, Display, GameObject, Vector, Rectangle, wrap, Font, Text, Radio, Events, Game, Time
 import shared
-from data_scene import DataScene
 
-scene = DataScene("level1", background_color=shared.background_color)
+scene = shared.DataScene("level1", background_color=shared.background_color)
 scene.level_size = int(Display.res.x * 1.2)
 
 end_location = Vector(Display.left + scene.level_size - 128, 450)

demo/platformer/data_scene.py

@@ -1,9 +1,8 @@
 from rubato import Display, Vector, Color, Rectangle, wrap, GameObject, Radio, Events, Game, Raster
-from data_scene import DataScene
 from moving_platform import MovingPlatform
 import shared
 
-scene = DataScene("level2", background_color=shared.background_color)
+scene = shared.DataScene("level2", background_color=shared.background_color)
 scene.level_size = int(Display.res.x * 2)
 
 end_location = Vector(Display.left + scene.level_size - 128, 0)

demo/platformer/files.zip

@@ -1,6 +1,6 @@
 from rubato import Component, Animation, RigidBody, Rectangle, Manifold, Radio, Events, KeyResponse, JoyButtonResponse \
     , Input, Math, Display, Game, Time, Vector
-from data_scene import DataScene
+from shared import DataScene
 
 
 class PlayerController(Component):

demo/platformer/level1.py

@@ -1,8 +1,19 @@
 import rubato as rb
-from data_scene import DataScene
-from player_controller import PlayerController
 from random import randint
 
+
+##### DATA SCENE #####
+class DataScene(rb.Scene):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.level_size = 0
+
+
+from player_controller import PlayerController
+
+##### MISC #####
+
 black_32 = rb.Font(size=32)
 white_32 = rb.Font(size=32, color=rb.Color.white)
 start_time = 0
@@ -57,9 +68,9 @@ def update(self):
     player_comp := PlayerController(),
 )
 
-##### PORTAL #####
+##### Flag #####
 
-# Create animation for portal
+# Create animation for flag
 flag_sheet = rb.Spritesheet(
     path="files/flag.png",
     sprite_size=rb.Vector(32, 32),
@@ -69,14 +80,14 @@ def update(self):
 flag_animation = rb.Animation(scale=rb.Vector(4, 4), fps=6, flipx=True)
 flag_animation.add_spritesheet("", flag_sheet, to_coord=flag_sheet.end)
 
-# create the end portal
+# create the end flag
 flag = rb.GameObject()
 flag.add(flag_animation)
 
 flag.add(
     rb.Rectangle(
         trigger=True,
-        tag="portal",
+        tag="flag",
         width=-flag_animation.anim_frame().size_scaled().x,
         height=flag_animation.anim_frame().size_scaled().y,
     )