@cyclonium/2d 2.0.1 → 3.0.0

package/lib/sort-settings.js

@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { cycloClass, editable, idem, designType, serializable } from '@cyclonium/core/legacy-decorator';
+import { cycloClass, editable, idem, designType, stored } from '@cyclonium/core/legacy-decorator';
 import { CCInteger } from 'cc';
 import { MIN_ORDER_IN_LAYER, MAX_ORDER_IN_LAYER } from './sortable.js';
 import { SortingLayer } from './sorting-layer.js';
@@ -64,10 +64,10 @@ __decorate([
     idem
 ], SortSettings.prototype, "orderInLayer", null);
 __decorate([
-    serializable
+    stored
 ], SortSettings.prototype, "_sortingLayer", void 0);
 __decorate([
-    serializable
+    stored
 ], SortSettings.prototype, "_orderInLayer", void 0);
 SortSettings = __decorate([
     cycloClass(`cyclo.SortSettings`)

package/lib/sorting-group.component.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { CycloComponent } from '@cyclonium/core/framework';
-import { editable, executeInEditMode, cycloClass, serializable } from '@cyclonium/core/legacy-decorator';
+import { editable, executeInEditMode, cycloClass, stored } from '@cyclonium/core/legacy-decorator';
 import { SortingTreeGroup } from './sortable.js';
 import { SortSettings } from './sort-settings.js';
 let SortingGroup = class SortingGroup extends CycloComponent {
@@ -31,7 +31,7 @@ __decorate([
     editable
 ], SortingGroup.prototype, "sortSettings", null);
 __decorate([
-    serializable
+    stored
 ], SortingGroup.prototype, "_sortSettings", void 0);
 SortingGroup = __decorate([
     cycloClass(`cyclo.SortingGroup`),

package/lib/sorting-tree.js

@@ -186,7 +186,7 @@ export class SortingTreeNode {
         const startSceneNode = SortingTreeGroup.is(component) ? component.node.parent : component.node;
         for (let currentNode = startSceneNode; currentNode; currentNode = currentNode.parent) {
             const sortingGroup = this._getSortingGroup(currentNode);
-            if (sortingGroup && sortingGroup.enabledInHierarchy) {
+            if (sortingGroup?.enabledInHierarchy) {
                 const sortingTreeNode = this._getOrCreateNode(sceneSortingRecord, sortingGroup);
                 return sortingTreeNode;
             }
@@ -253,7 +253,7 @@ export class SortingTreeNode {
             // If child scene node is a sorting group, then itself is our child,
             // but its child scene nodes are not our children.
             const childSortingGroup = this._getSortingGroup(childSceneNode);
-            if (childSortingGroup && childSortingGroup.enabledInHierarchy) {
+            if (childSortingGroup?.enabledInHierarchy) {
                 let childTreeNode = sceneSortingRecord.treeNodeMap.get(childSortingGroup);
                 if (childTreeNode) {
                     // Add component to a node already involved in sorting tree.

package/lib/sprite-renderer.component.d.ts

@@ -9,13 +9,13 @@ export declare enum SpriteRenderType {
 }
 export declare class SpriteRenderer extends CycloComponent implements SortableRenderer {
     static prepare(): Promise<void>;
+    debugShowNormals: boolean;
     get renderType(): SpriteRenderType;
     set renderType(value: SpriteRenderType);
     get color(): Color;
     set color(value: Color);
     get sprite(): Sprite | undefined;
     set sprite(value: Sprite | undefined);
-    debugShowNormals: boolean;
     get sortSettings(): SortSettings;
     get [SortableRenderer.Tags.sortSettings](): SortSettings;
     get geometryScale(): number;

package/lib/sprite-renderer.component.js

@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { CycloComponent } from '@cyclonium/core/framework';
-import { designType, editable, executeInEditMode, cycloClass, idem, serializable } from '@cyclonium/core/legacy-decorator';
+import { designType, editable, executeInEditMode, cycloClass, idem, stored } from '@cyclonium/core/legacy-decorator';
 import { Material, Color, renderer, RenderingSubMesh, gfx, EffectAsset, Vec3, componentEditorTraits, geometry, assetManager } from 'cc';
 import { assert, markEnum } from '@cyclonium/core/utils';
 import { logger } from '@cyclonium/core/log';
@@ -33,16 +33,14 @@ const loadDefaultEffect = (() => {
         if (defaultEffect instanceof Promise) {
             return defaultEffect;
         }
-        if (!defaultEffect) {
-            defaultEffect = (async () => {
-                const loadedEffect = await loadAsset('230b4535-10a9-475d-843a-05cbf87b2227');
-                defaultEffect = loadedEffect;
-                return loadedEffect;
-            })().catch((error) => {
-                logger.error('Failed to load default effect', error);
-                return undefined;
-            });
-        }
+        defaultEffect ??= (async () => {
+            const loadedEffect = await loadAsset('230b4535-10a9-475d-843a-05cbf87b2227');
+            defaultEffect = loadedEffect;
+            return loadedEffect;
+        })().catch((error) => {
+            logger.error('Failed to load default effect', error);
+            return undefined;
+        });
         return defaultEffect;
     };
 })();
@@ -53,6 +51,7 @@ let SpriteRenderer = class SpriteRenderer extends CycloComponent {
             throw new Error('Failed to load default sprite renderer effect');
         }
     }
+    debugShowNormals = false;
     get renderType() {
         return this._renderType;
     }
@@ -79,7 +78,6 @@ let SpriteRenderer = class SpriteRenderer extends CycloComponent {
         }
         this._markRenderRecordDirty(RenderRecordDirtyFlag.bounds);
     }
-    debugShowNormals = false;
     get sortSettings() {
         return this._sortSettings;
     }
@@ -362,9 +360,12 @@ let SpriteRenderer = class SpriteRenderer extends CycloComponent {
         return this.enabledInHierarchy && !!this.sprite;
     }
 };
+__decorate([
+    stored,
+    editable
+], SpriteRenderer.prototype, "debugShowNormals", void 0);
 __decorate([
     editable,
-    serializable,
     designType(SpriteRenderType),
     idem
 ], SpriteRenderer.prototype, "renderType", null);
@@ -374,10 +375,6 @@ __decorate([
 __decorate([
     editable(Sprite)
 ], SpriteRenderer.prototype, "sprite", null);
-__decorate([
-    editable,
-    serializable
-], SpriteRenderer.prototype, "debugShowNormals", void 0);
 __decorate([
     editable
 ], SpriteRenderer.prototype, "sortSettings", null);
@@ -390,22 +387,22 @@ __decorate([
     idem
 ], SpriteRenderer.prototype, "material", null);
 __decorate([
-    serializable
+    stored
 ], SpriteRenderer.prototype, "_renderType", void 0);
 __decorate([
-    serializable
+    stored
 ], SpriteRenderer.prototype, "_color", void 0);
 __decorate([
-    serializable
+    stored
 ], SpriteRenderer.prototype, "_sprite", void 0);
 __decorate([
-    serializable
+    stored
 ], SpriteRenderer.prototype, "_geometryScale", void 0);
 __decorate([
-    serializable
+    stored
 ], SpriteRenderer.prototype, "_material", void 0);
 __decorate([
-    serializable
+    stored
 ], SpriteRenderer.prototype, "_sortSettings", void 0);
 SpriteRenderer = __decorate([
     cycloClass('cyclo.SpriteRenderer'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyclonium/2d",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/shrinktofit/cyclonium",
@@ -18,8 +18,8 @@
     "./assets-meta": "./assets/.meta.json"
   },
   "peerDependencies": {
-    "@cyclonium/core": "0.0.104",
-    "@cyclonium/editor": "0.0.104"
+    "@cyclonium/core": "1.0.0",
+    "@cyclonium/editor": "1.0.0"
   },
   "peerDependenciesMeta": {
     "@cyclonium/editor": {
@@ -32,9 +32,9 @@
     "playwright": "^1.59.1",
     "typescript": "^6.0.2",
     "vitest": "^4.1.5",
-    "@cyclonium/canvas-3d": "0.0.104",
-    "@cyclonium/editor": "0.0.104",
+    "@cyclonium/canvas-3d": "1.0.0",
     "@cyclonium/cc-test": "0.0.102",
+    "@cyclonium/editor": "1.0.0",
     "@cyclonium/workflow": "0.0.100",
     "@cyclonium/types-cc": "0.0.100"
   },