@playcanvas/web-components 0.1.3 → 0.1.5

package/src/sky.ts

@@ -1,61 +1,72 @@
-import { LAYERID_SKYBOX, Quat } from 'playcanvas';
+import { EnvLighting, LAYERID_SKYBOX, Quat, Texture, Vec3 } from 'playcanvas';
 
-import { AppElement } from './app';
 import { AssetElement } from './asset';
+import { AsyncElement } from './async-element';
+import { parseVec3 } from './utils';
 
 /**
  * Represents a sky in the PlayCanvas engine.
  */
-class SkyElement extends HTMLElement {
+class SkyElement extends AsyncElement {
     private _asset = '';
 
+    private _center = new Vec3(0, 0.01, 0);
+
     private _intensity = 1;
 
-    private _rotation = [0, 0, 0];
+    private _rotation = new Vec3();
 
     private _level = 0;
 
-    private _solidColor = false;
+    private _scale = new Vec3(100, 100, 100);
 
-    async connectedCallback() {
-        // Get the application
-        const appElement = this.closest('pc-app') as AppElement;
-        if (!appElement) {
-            console.warn(`${this.tagName} must be a child of pc-app`);
-            return;
-        }
+    private _type: 'box' | 'dome' | 'infinite' | 'none' = 'infinite';
 
-        await appElement.getApplication();
+    async connectedCallback() {
+        await this.closestApp?.ready();
 
         this.asset = this.getAttribute('asset') || '';
-        this.solidColor = this.hasAttribute('solid-color');
+
+        this._onReady();
     }
 
     getScene() {
-        const appElement = this.closest('pc-app') as AppElement | null;
-        if (!appElement) {
-            return;
-        }
-        const app = appElement.app;
+        const app = this.closestApp!.app;
         if (!app) {
             return;
         }
         return app.scene;
     }
 
+    private initSkybox(source: Texture) {
+        source.anisotropy = 4;
+
+        const skybox = EnvLighting.generateSkyboxCubemap(source);
+        const lighting = EnvLighting.generateLightingSource(source);
+        const envAtlas = EnvLighting.generateAtlas(lighting);
+        const app = this.closestApp!.app;
+        if (app) {
+            app.scene.envAtlas = envAtlas;
+            app.scene.skybox = skybox;
+
+            const layer = app.scene.layers.getLayerById(LAYERID_SKYBOX);
+            if (layer) {
+                layer.enabled = this._type !== 'none';
+            }
+
+            app.scene.sky.type = this._type;
+            app.scene.sky.node.setLocalScale(this._scale);
+            app.scene.sky.center = this._center;
+        }
+    }
+
     set asset(value: string) {
         this._asset = value;
         const scene = this.getScene();
         if (scene) {
             const asset = AssetElement.get(value);
             if (asset) {
-                if (asset.resource) {
-                    scene.envAtlas = asset.resource;
-                } else {
-                    asset.once('load', () => {
-                        scene.envAtlas = asset.resource;
-                    });
-                }
+                this.initSkybox(asset.resource);
             }
         }
     }
@@ -64,6 +75,18 @@ class SkyElement extends HTMLElement {
         return this._asset;
     }
 
+    set center(value: Vec3) {
+        this._center = value;
+        const scene = this.getScene();
+        if (scene) {
+            scene.sky.center = this._center;
+        }
+    }
+
+    get center() {
+        return this._center;
+    }
+
     set intensity(value: number) {
         this._intensity = value;
         const scene = this.getScene();
@@ -76,11 +99,11 @@ class SkyElement extends HTMLElement {
         return this._intensity;
     }
 
-    set rotation(value: number[]) {
+    set rotation(value: Vec3) {
         this._rotation = value;
         const scene = this.getScene();
         if (scene) {
-            scene.skyboxRotation = new Quat().setFromEulerAngles(this._rotation[0], this._rotation[1], this._rotation[2]);
+            scene.skyboxRotation = new Quat().setFromEulerAngles(value);
         }
     }
 
@@ -88,19 +111,16 @@ class SkyElement extends HTMLElement {
         return this._rotation;
     }
 
-    set solidColor(value: boolean) {
-        this._solidColor = value;
+    set scale(value: Vec3) {
+        this._scale = value;
         const scene = this.getScene();
         if (scene) {
-            const layer = scene.layers.getLayerById(LAYERID_SKYBOX);
-            if (layer) {
-                layer.enabled = !this._solidColor;
-            }
+            scene.sky.node.setLocalScale(this._scale);
         }
     }
 
-    get solidColor() {
-        return this._solidColor;
+    get scale() {
+        return this._scale;
     }
 
     set level(value: number) {
@@ -115,8 +135,24 @@ class SkyElement extends HTMLElement {
         return this._level;
     }
 
+    set type(value: 'box' | 'dome' | 'infinite' | 'none') {
+        this._type = value;
+        const scene = this.getScene();
+        if (scene) {
+            scene.sky.type = this._type;
+            const layer = scene.layers.getLayerById(LAYERID_SKYBOX);
+            if (layer) {
+                layer.enabled = this._type !== 'none';
+            }
+        }
+    }
+
+    get type() {
+        return this._type;
+    }
+
     static get observedAttributes() {
-        return ['asset', 'intensity', 'level', 'rotation', 'solid-color'];
+        return ['asset', 'center', 'intensity', 'level', 'rotation', 'scale', 'type'];
     }
 
     attributeChangedCallback(name: string, _oldValue: string, newValue: string) {
@@ -124,17 +160,23 @@ class SkyElement extends HTMLElement {
             case 'asset':
                 this.asset = newValue;
                 break;
+            case 'center':
+                this.center = parseVec3(newValue);
+                break;
             case 'intensity':
                 this.intensity = parseFloat(newValue);
                 break;
             case 'rotation':
-                this.rotation = newValue.split(',').map(Number);
+                this.rotation = parseVec3(newValue);
                 break;
             case 'level':
                 this.level = parseInt(newValue, 10);
                 break;
-            case 'solid-color':
-                this.solidColor = this.hasAttribute('solid-color');
+            case 'scale':
+                this.scale = parseVec3(newValue);
+                break;
+            case 'type':
+                this.type = newValue as 'box' | 'dome' | 'infinite' | 'none';
                 break;
         }
     }

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { Color, Vec2, Vec3, Vec4 } from 'playcanvas';
+import { Color, Quat, Vec2, Vec3, Vec4 } from 'playcanvas';
 
 /**
  * Parse a color string into a Color object. String can be in the format of '#rgb', '#rgba',
@@ -16,6 +16,19 @@ export const parseColor = (value: string): Color => {
     return new Color(components);
 };
 
+/**
+ * Parse an Euler angles string into a Quat object. String can be in the format of 'x,y,z'.
+ *
+ * @param value - The Euler angles string to parse.
+ * @returns The parsed Quat object.
+ */
+export const parseQuat = (value: string): Quat => {
+    const [x, y, z] = value.split(',').map(Number);
+    const q = new Quat();
+    q.setFromEulerAngles(x, y, z);
+    return q;
+};
+
 /**
  * Parse a Vec2 string into a Vec2 object. String can be in the format of 'x,y'.
  *