merge main

README.md

@@ -71,7 +71,7 @@ import { Engine, Scene, Entity } from "oasis-engine";
 
 Everyone is welcome to join us! Whether you find a bug, have a great feature request or you fancy owning a task from the road map feel free to get in touch.
 
-Make sure to read the [Contributing Guide](.github/HOW_TO_CONTRIBUTE.md) before submitting changes.
+Make sure to read the [Contributing Guide](.github/HOW_TO_CONTRIBUTE.md) / [贡献指南](https://github.com/oasis-engine/engine/wiki/%E5%A6%82%E4%BD%95%E4%B8%8E%E6%88%91%E4%BB%AC%E5%85%B1%E5%BB%BA-Oasis-%E5%BC%80%E6%BA%90%E4%BA%92%E5%8A%A8%E5%BC%95%E6%93%8E) before submitting changes.
 
 ## Build
 

lerna.json

@@ -1,6 +1,6 @@
 {
   "npmClient": "npm",
-  "version": "0.5.7",
+  "version": "0.6.0-alpha.1",
   "bootstrap": {
     "hoist": true
   },

packages/controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasis-engine/controls",
-  "version": "0.5.7",
+  "version": "0.6.0-alpha.1",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc",
@@ -15,6 +15,6 @@
     "types/**/*"
   ],
   "dependencies": {
-    "oasis-engine": "0.5.7"
+    "oasis-engine": "0.6.0-alpha.1"
   }
 }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oasis-engine/core",
-  "version": "0.5.7",
+  "version": "0.6.0-alpha.1",
   "license": "MIT",
   "main": "dist/main.js",
   "module": "dist/module.js",
@@ -14,9 +14,9 @@
     "types/**/*"
   ],
   "dependencies": {
-    "@oasis-engine/math": "0.5.7"
+    "@oasis-engine/math": "0.6.0-alpha.1"
   },
   "devDependencies": {
-    "@oasis-engine/design": "0.5.7"
+    "@oasis-engine/design": "0.6.0-alpha.1"
   }
 }

packages/core/src/ComponentsManager.ts

@@ -235,7 +235,7 @@ export class ComponentsManager {
     const camComps = camera.entity._components;
     for (let i = camComps.length - 1; i >= 0; --i) {
       const camComp = camComps[i];
-      (camComp as any).onBeginRender && (camComp as any).onEndRender(camera);
+      (camComp as any).onEndRender && (camComp as any).onEndRender(camera);
     }
   }
 

packages/core/src/Scene.ts

@@ -19,8 +19,6 @@ export class Scene extends EngineObject {
 
   /** Scene name. */
   name: string;
-  /** Ambient light. */
-  ambientLight: AmbientLight;
 
   /** The background of the scene. */
   readonly background: Background = new Background(this._engine);
@@ -37,6 +35,28 @@ export class Scene extends EngineObject {
 
   private _destroyed: boolean = false;
   private _rootEntities: Entity[] = [];
+  private _ambientLight: AmbientLight;
+
+  /**
+   * Ambient light.
+   */
+  get ambientLight(): AmbientLight {
+    return this._ambientLight;
+  }
+
+  set ambientLight(value: AmbientLight) {
+    if (!value) {
+      Logger.warn("The scene must have one ambient light");
+      return;
+    }
+
+    const lastAmbientLight = this._ambientLight;
+    if (lastAmbientLight !== value) {
+      lastAmbientLight && lastAmbientLight._setScene(null);
+      value._setScene(this);
+      this._ambientLight = value;
+    }
+  }
 
   /**
    * Count of root entities.
@@ -71,7 +91,7 @@ export class Scene extends EngineObject {
     const shaderData = this.shaderData;
     Scene.sceneFeatureManager.addObject(this);
     shaderData._addRefCount(1);
-    this.ambientLight = new AmbientLight(this);
+    this.ambientLight = new AmbientLight();
   }
 
   /**

packages/core/src/animation/AnimationClip.ts

@@ -46,12 +46,31 @@ export class AnimationClip extends Motion {
     super();
   }
 
+  /**
+   * Adds an animation event to the clip.
+   * @param functionName - The name of the method called in the script
+   * @param time - The time when the event be triggered
+   * @param parameter - The parameter that is stored in the event and will be sent to the function
+   */
+  addEvent(functionName: string, time: number, parameter: Object): void;
+
   /**
    * Adds an animation event to the clip.
    * @param event - The animation event
    */
-  addEvent(event: AnimationEvent): void {
-    this._events.push(event);
+  addEvent(event: AnimationEvent): void;
+
+
+  addEvent(param: AnimationEvent | string, time?: number, parameter?: Object): void {
+    if (typeof param === 'string') {
+      const event = new AnimationEvent();
+      event.functionName = param;
+      event.time = time;
+      event.parameter = parameter;
+      this._events.push(event);
+    } else {
+      this._events.push(param);
+    }
     this._events.sort((a, b) => a.time - b.time);
   }
 

packages/core/src/animation/Animator.ts

@@ -171,6 +171,14 @@ export class Animator extends Component {
     }
   }
 
+  /**
+   * Get the playing state from the target layerIndex.
+   * @param layerIndex - The layer index
+   */
+  getCurrentAnimatorState(layerIndex: number) {
+    return this._animatorLayersData[layerIndex]?.srcPlayData?.state;
+  }
+
   /**
    * @override
    * @internal
@@ -490,9 +498,15 @@ export class Animator extends Component {
 
     let crossWeight = destPlayData.frameTime / (destState._getDuration() * layerData.crossFadeTransition.duration);
     crossWeight >= 1.0 && (crossWeight = 1.0);
+
     srcPlayData.update();
     destPlayData.update();
 
+    const { playState: srcPlayState } = srcPlayData;
+    const { playState: destPlayState } = destPlayData;
+
+    this._updateCrossFadeData(layerData, crossWeight, delta, false);
+
     const { clipTime: srcClipTime } = srcPlayData;
     const { clipTime: destClipTime } = destPlayData;
 
@@ -503,7 +517,7 @@ export class Animator extends Component {
     if (lastSrcPlayState === AnimatorStatePlayState.UnStarted) {
       this._callAnimatorScriptOnEnter(srcState, layerIndex);
     }
-    if (crossWeight === 1 || srcPlayData.playState === AnimatorStatePlayState.Finished) {
+    if (crossWeight === 1 || srcPlayState === AnimatorStatePlayState.Finished) {
       this._callAnimatorScriptOnExit(srcState, layerIndex);
     } else {
       this._callAnimatorScriptOnUpdate(srcState, layerIndex);
@@ -512,7 +526,7 @@ export class Animator extends Component {
     if (lastDstPlayState === AnimatorStatePlayState.UnStarted) {
       this._callAnimatorScriptOnEnter(destState, layerIndex);
     }
-    if (destPlayData.playState === AnimatorStatePlayState.Finished) {
+    if (destPlayState === AnimatorStatePlayState.Finished) {
       this._callAnimatorScriptOnExit(destState, layerIndex);
     } else {
       this._callAnimatorScriptOnUpdate(destState, layerIndex);
@@ -533,7 +547,6 @@ export class Animator extends Component {
 
       this._applyCrossClipValue(curveOwner, srcValue, destValue, crossWeight, weight, additive);
     }
-    this._updateCrossFadeData(layerData, crossWeight, delta, false);
   }
 
   private _updateCrossFadeFromPose(
@@ -552,16 +565,21 @@ export class Animator extends Component {
 
     let crossWeight = destPlayData.frameTime / (state._getDuration() * layerData.crossFadeTransition.duration);
     crossWeight >= 1.0 && (crossWeight = 1.0);
+
     destPlayData.update();
 
+    const { playState } = destPlayData;
+
+    this._updateCrossFadeData(layerData, crossWeight, delta, true);
+
     const { clipTime: destClipTime } = destPlayData;
 
     eventHandlers.length && this._fireAnimationEvents(destPlayData, eventHandlers, lastDestClipTime, destClipTime);
-    
+
     if (lastPlayState === AnimatorStatePlayState.UnStarted) {
       this._callAnimatorScriptOnEnter(state, layerIndex);
     }
-    if (destPlayData.playState === AnimatorStatePlayState.Finished) {
+    if (playState === AnimatorStatePlayState.Finished) {
       this._callAnimatorScriptOnExit(state, layerIndex);
     } else {
       this._callAnimatorScriptOnUpdate(state, layerIndex);
@@ -576,8 +594,6 @@ export class Animator extends Component {
 
       this._applyCrossClipValue(curveOwner, curveOwner.fixedPoseValue, destValue, crossWeight, weight, additive);
     }
-
-    this._updateCrossFadeData(layerData, crossWeight, delta, true);
   }
 
   private _updateCrossFadeData(layerData: AnimatorLayerData, crossWeight: number, delta: number, fixed: boolean): void {
@@ -793,11 +809,13 @@ export class Animator extends Component {
     lastClipTime: number,
     clipTime: number
   ): void {
+    const { state } = playState;
+    const clipDuration = state.clip.length;
     // TODO: If play backward, not work.
     if (clipTime < lastClipTime) {
-      this._fireSubAnimationEvents(playState, eventHandlers, lastClipTime, playState.state.clipEndTime);
+      this._fireSubAnimationEvents(playState, eventHandlers, lastClipTime, state.clipEndTime * clipDuration);
       playState.currentEventIndex = 0;
-      this._fireSubAnimationEvents(playState, eventHandlers, playState.state.clipStartTime, clipTime);
+      this._fireSubAnimationEvents(playState, eventHandlers, state.clipStartTime * clipDuration, clipTime);
     } else {
       this._fireSubAnimationEvents(playState, eventHandlers, lastClipTime, clipTime);
     }

packages/core/src/animation/AnimatorState.ts

@@ -20,7 +20,7 @@ export class AnimatorState {
   _onStateExitScripts: StateMachineScript[] = [];
 
   private _clipStartTime: number = 0;
-  private _clipEndTime: number = Infinity;
+  private _clipEndTime: number = 1;
   private _clip: AnimationClip;
   private _transitions: AnimatorStateTransition[] = [];
 
@@ -44,28 +44,25 @@ export class AnimatorState {
   }
 
   /**
-   * The clip start time the user set , default is 0.
+   * The start time of the clip, the range is 0 to 1, default is 0.
    */
   get clipStartTime() {
     return this._clipStartTime;
   }
 
   set clipStartTime(time: number) {
-    this._clipStartTime = time < 0 ? 0 : time;
+    this._clipStartTime = Math.max(time, 0);
   }
 
   /**
-   * The clip end time the user set , default is the clip duration.
+   * The start time of the clip, the range is 0 to 1, default is 1.
    */
   get clipEndTime() {
     return this._clipEndTime;
   }
 
   set clipEndTime(time: number) {
-    const clip = this._clip;
-    if (clip) {
-      this._clipEndTime = Math.min(time, clip.length);
-    }
+    this._clipEndTime = Math.min(time, 1);
   }
 
   /**
@@ -123,7 +120,10 @@ export class AnimatorState {
    * @internal
    */
   _getDuration(): number {
-    return this._clipEndTime - this._clipStartTime;
+    if (this.clip) {
+      return (this._clipEndTime - this._clipStartTime) * this.clip.length;
+    }
+    return null;
   }
 
   /**

packages/core/src/animation/internal/AnimatorStatePlayData.ts

@@ -19,14 +19,14 @@ export class AnimatorStatePlayData {
     this.frameTime = offsetFrameTime;
     this.stateData = stateData;
     this.playState = AnimatorStatePlayState.UnStarted;
-    this.clipTime = this.state.clipStartTime;
+    this.clipTime = state.clipStartTime * state.clip.length;
     this.currentEventIndex = 0;
   }
 
   update(): void {
     const state = this.state;
     let time = this.frameTime;
-    const duration = state.clipEndTime - state.clipStartTime;
+    const duration = state._getDuration();
     this.playState = AnimatorStatePlayState.Playing;
     if (time > duration) {
       if (state.wrapMode === WrapMode.Loop) {
@@ -36,6 +36,6 @@ export class AnimatorStatePlayData {
         this.playState = AnimatorStatePlayState.Finished;
       }
     }
-    this.clipTime = time + this.state.clipStartTime;
+    this.clipTime = time + state.clipStartTime * state.clip.length;
   }
 }

packages/core/src/input/pointer/PointerManager.ts

@@ -48,8 +48,8 @@ export class PointerManager {
     htmlCanvas.onpointerdown = htmlCanvas.onpointerup = htmlCanvas.onpointerout = htmlCanvas.onpointermove = (evt:PointerEvent)=>{
       this._nativeEvents.push(evt);
     };
-    // MaxTouchCount + MouseCount(1)
-    this._pointerPool = new Array<Pointer>(navigator.maxTouchPoints + 1);
+    // If there are no compatibility issues, navigator.maxTouchPoints should be used here.
+    this._pointerPool = new Array<Pointer>(11);
     this._enablePhysics = engine.physicsManager ? true : false;
   }