Rename ability to component. (galacean#608)

luzhuang · Mar 2, 2022 · 5401e8a · 5401e8a
1 parent 29aebf3
commit 5401e8a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/packages/core/src/ComponentsDependencies.ts b/packages/core/src/ComponentsDependencies.ts
@@ -70,8 +70,8 @@ export class ComponentsDependencies {
   private constructor() {}
 }
 
-export function dependencies(...abilityClass: ComponentConstructor[]) {
+export function dependencies(...componentClass: ComponentConstructor[]) {
   return function <T extends ComponentConstructor>(target: T): void {
-    abilityClass.forEach((ability) => ComponentsDependencies.register(target, ability));
+    componentClass.forEach((component) => ComponentsDependencies.register(target, component));
   };
 }
diff --git a/packages/core/src/Entity.ts b/packages/core/src/Entity.ts
@@ -343,9 +343,9 @@ export class Entity extends EngineObject {
     if (this._destroyed) return;
 
     super.destroy();
-    const abilityArray = this._components;
-    for (let i = abilityArray.length - 1; i >= 0; i--) {
-      abilityArray[i].destroy();
+    const components = this._components;
+    for (let i = components.length - 1; i >= 0; i--) {
+      components[i].destroy();
     }
     this._components.length = 0;
 

diff --git a/packages/core/src/lighting/KHR_lights.ts b/packages/core/src/lighting/KHR_lights.ts
@@ -11,34 +11,34 @@ class KHR_lights {
     for (let i = 0; i < lights.length; i++) {
       const { name, type, spot } = lights[i];
       let { color, intensity } = lights[i];
-      let ability;
+      let component;
       let props;
       color = color ? color : [1, 1, 1];
       intensity = intensity === undefined ? 1 : intensity;
       switch (type) {
         case "ambient":
-          ability = AmbientLight;
+          component = AmbientLight;
           props = { name, color, intensity };
           break;
         case "directional":
-          ability = DirectLight;
+          component = DirectLight;
           props = { name, color, intensity };
           break;
         case "point":
-          ability = PointLight;
+          component = PointLight;
           props = { name, color, intensity };
           break;
         case "spot":
-          ability = SpotLight;
+          component = SpotLight;
           props = { name, color, intensity, angle: spot.outerConeAngle };
           break;
         default:
           Logger.error(`unknown light typ ${type}`);
           break;
       }
 
-      if (ability) {
-        results[i] = { ability, props };
+      if (component) {
+        results[i] = { component, props };
       }
     }
     return results;

diff --git a/packages/core/src/shadow/ShadowFeature.ts b/packages/core/src/shadow/ShadowFeature.ts
@@ -90,20 +90,20 @@ export class ShadowFeature extends SceneFeature {
     const items = renderQueue.items;
     for (let i = 0, len = items.length; i < len; i++) {
       const item = items[i];
-      const ability: Component = item.component;
+      const component: Component = item.component;
 
-      const receiveShadow = (ability as any).recieveShadow;
-      const castShadow = (ability as any).castShadow;
+      const receiveShadow = (component as any).recieveShadow;
+      const castShadow = (component as any).castShadow;
       if (receiveShadow === true) {
-        ability.entity.layer |= Layer.Layer30; //SHADOW;
+        component.entity.layer |= Layer.Layer30; //SHADOW;
       } else if (receiveShadow === false) {
-        ability.entity.layer &= ~Layer.Layer30; //SHADOW;
+        component.entity.layer &= ~Layer.Layer30; //SHADOW;
       }
 
       if (castShadow === true) {
-        ability.entity.layer |= Layer.Layer31; //SHADOW_MAP;
+        component.entity.layer |= Layer.Layer31; //SHADOW_MAP;
       } else if (castShadow === false) {
-        ability.entity.layer &= ~Layer.Layer31; //SHADOW_MAP;
+        component.entity.layer &= ~Layer.Layer31; //SHADOW_MAP;
       }
     }
   }