Updated engon from monorepo commit cd5f3b763822db6d2b10d1d832519b66e60e7023

Author: Griperis

README.md

@@ -36,11 +36,13 @@
 - [Getting Started](#getting-started)
   - [Prerequisites](#prerequisites)
   - [Installation](#installation)
-    - [Blender 4.2 or newer](#blender-42-or-newer)
-    - [Blender 4.1 or older](#blender-41-or-older)
-      - [Download the addon ZIP](#download-the-addon-zip)
+    - [Install from Extensions Repository](#install-from-extensions-repository)
+    - [Install from Disk](#install-from-disk)
+      - [Download the ZIP](#download-the-zip)
       - [Install ZIP in Blender](#install-zip-in-blender)
   - [Updating](#updating)
+    - [Update from Repository](#update-from-repository)
+    - [Updater](#updater)
 - [Roadmap](#roadmap)
 - [Support](#support)
 - [Project assistance](#project-assistance)
@@ -74,32 +76,44 @@
 
 ### Prerequisites
 
-> You need [Blender 3.6 LTS or higher](https://blender.org). Windows, macOS 10 and Linux are
+> You need [Blender 4.2 LTS or higher](https://blender.org). Windows, macOS 10 and Linux are
 > supported.
 
 ### Installation
 
-#### Blender 4.2 or newer
+#### Install from Extensions Repository
+
 Visit [polygoniq extensions repository](https://extensions.polygoniq.com), where we explain
 how to set it up as remote repository so you can install and update everything from Blender.
 
-#### Blender 4.1 or older
-##### Download the addon ZIP
+#### Install from Disk
+
+##### Download the ZIP
 
 |                          Stable Release                                                  |                         Unstable Master Branch                   |
 | :--------------------------------------------------------------------------------------: | :--------------------------------------------------------------: |
-| Head over to [Releases](https://github.com/polygoniq/engon/releases) for a stable ZIP.   | Click `Code` -> `Download ZIP` if you are feeling adventurous.   |
+| Head over to [Releases](https://github.com/polygoniq/engon/releases) for a stable ZIP.  | Click `Code` -> `Download ZIP` if you are feeling adventurous.   |
 
 ##### Install ZIP in Blender
 
-Go to `Edit` -> `Preferences`. And select `Add-ons` in the left bar. Click the `Install...` button
+Go to `Edit` -> `Preferences`. And select `Get Extensions` in the left bar. Click the `Install from Disk...` button
 in the top section. Select the ZIP file you just downloaded and click `Install Add-on`. After the
 installation finishes, check the checkbox next to the `engon` addon.
 
 ### Updating
 
+#### Update from Repository
+
+Navigate to `Edit` -> `Preferences` and select `Extensions` in the left bar. Write `engon`
+in the top search bar, expand the panel and click on `Update`.
+
+If you cannot see the `Update` button even though you know you're not on the latest version
+available, click the small arrow in the top-right corner and select `Check for Updates`.
+
+#### Updater
+
 The addon can auto-update itself to latest stable or even unstable master version. Head over to
-`Edit` -> `Preferences` and select `Add-ons` in the left bar. Type `engon` into the search bar
+`Edit` -> `Preferences` and select `Get Extensions` in the left bar. Type `engon` into the search bar
 and then expand the addon section of `engon`. Scroll down to the auto update section to set up
 update intervals or even update manually.
 

__init__.py

@@ -133,12 +133,12 @@
 bl_info = {
     "name": "engon",
     "author": "polygoniq xyz s.r.o.",
-    "version": (1, 6, 1),  # bump doc_url and version in register as well!
-    "blender": (3, 6, 0),
+    "version": (1, 7, 0),  # bump doc_url and version in register as well!
+    "blender": (4, 2, 0),
     "location": "polygoniq tab in the sidebar of the 3D View window",
     "description": "Browse assets, filter and sort, scatter, animate, adjust rigs",
     "category": "Object",
-    "doc_url": "https://docs.polygoniq.com/engon/1.6.1/",
+    "doc_url": "https://docs.polygoniq.com/engon/1.7.0/",
     "tracker_url": "https://polygoniq.com/discord/",
 }
 
@@ -161,7 +161,7 @@ def _post_register():
 def register():
     # We pass mock "bl_info" to the updater, as from Blender 4.2.0, the "bl_info" is
     # no longer available in this scope.
-    addon_updater_ops.register({"version": (1, 6, 1)})
+    addon_updater_ops.register({"version": (1, 7, 0)})
 
     utils.register()
     pack_info_search_paths.register()

asset_helpers.py

@@ -83,6 +83,12 @@
     (0.8, (0.004, 0.004, 0.004)),  # 0E0E0E
 )
 
+# aesthetiq constants
+SQ_PICTORAL_MATERIALS_LIBRARY_BLEND = "sq_Library_Pictoral-Materials.blend"
+SQ_PICTORIAL_MATERIAL_PREFIX = "sq_Pictoral_"  # todo: fix typo in "Pictoral" in material names
+SQ_FRAME_GENERATOR_LIBRARY_BLEND = "sq_Library_Frame-Generator-Geonodes.blend"
+SQ_FRAME_GENERATOR_MODIFIER = "sq_Frame-Generator"
+SQ_FRAME_GENERATOR_OBJECT = "sq_Frame-generator"
 
 PARTICLE_SYSTEM_PREFIX = f"engon_{polib.asset_pack.PARTICLE_SYSTEM_TOKEN}_"
 
@@ -144,7 +150,7 @@ def is_obj_with_engon_feature(
     return feature in asset_pack.engon_features
 
 
-def is_object_from_seasons(obj: bpy.types.Object, seasons: typing.Set[str]) -> bool:
+def is_object_from_seasons(obj: bpy.types.Object, seasons: set[str]) -> bool:
     pure_name = polib.utils_bpy.remove_object_duplicate_suffix(obj.name)
     name_split = pure_name.rsplit("_", 3)
     if len(name_split) != 4:
@@ -185,9 +191,7 @@ def get_materialiq_texture_sizes_enum_items():
     return [(str(size), str(size), f"materialiq texture size: {size}") for size in texture_sizes]
 
 
-def get_asset_pack_library_path(
-    engon_feature: str, library_blend_name: str
-) -> typing.Optional[str]:
+def get_asset_pack_library_path(engon_feature: str, library_blend_name: str) -> str | None:
     for pack in asset_registry.instance.get_packs_by_engon_feature(engon_feature):
         for lib in glob.iglob(
             os.path.join(pack.install_path, "blends", "**", library_blend_name), recursive=True
@@ -213,17 +217,15 @@ def exclude_variant_from_asset_name(asset_name: str) -> str:
     return "_".join([category, name, seasons])
 
 
-class ObjectSource(enum.Enum):
-    editable = (0,)
-    instanced = (1,)
-    particles = (2,)
+class ObjectSource(enum.StrEnum):
+    EDITABLE = "EDITABLE"
+    INSTANCED = "INSTANCED"
+    PARTICLES = "PARTICLES"
 
 
 ObjectSourceMap = typing.Mapping[
     str,
-    typing.List[
-        typing.Tuple[ObjectSource, typing.Union[bpy.types.Object, bpy.types.ParticleSystem]]
-    ],
+    list[tuple[ObjectSource, bpy.types.Object | bpy.types.ParticleSystem]],
 ]
 
 
@@ -257,15 +259,15 @@ def get_obj_source_map(objs: typing.Iterable[bpy.types.Object]) -> ObjectSourceM
             and obj.instance_collection is not None
         ):
             for o in obj.instance_collection.all_objects:
-                m[o.name].append((ObjectSource.instanced, obj))
+                m[o.name].append((ObjectSource.INSTANCED, obj))
 
         elif obj.type == 'MESH':
             for ps in obj.particle_systems:
                 if ps.settings.instance_collection is not None:
                     for o in ps.settings.instance_collection.all_objects:
-                        m[o.name].append((ObjectSource.particles, ps))
+                        m[o.name].append((ObjectSource.PARTICLES, ps))
 
-            m[obj.name].append((ObjectSource.editable, obj))
+            m[obj.name].append((ObjectSource.EDITABLE, obj))
     return m
 
 
@@ -332,7 +334,7 @@ def gather_curves_instanced_objects(
                 yield from instance_collection.collection.all_objects
 
 
-def get_car_color() -> typing.Tuple[float, float, float]:
+def get_car_color() -> tuple[float, float, float]:
     value = random.random()
     idx = bisect.bisect(TQ_COLOR_DISTRIBUTION, value, key=lambda x: x[0]) - 1
     return TQ_COLOR_DISTRIBUTION[idx][1]