dsview & ds input[DO NOT MERGE]

.github/workflows/native-bindings.yml

@@ -3,13 +3,6 @@ name: <Native> Generate Code
 on:
   pull_request_target:
     types: [closed]
-  # pull_request:
-    paths:
-    - 'templates/**'
-    - 'native/**'
-    - 'cocos/**'
-    - 'package.json'
-    - '.github/workflows/native-bindings.yml'
 
 jobs:
   autogen-code:

EngineErrorMap.md

@@ -3367,4 +3367,12 @@ node '%s' doesn't have any ModelRenderer component, this component will not work
 
 ### 16302
 
-There is no reflection probe in the scene or no probe is near the current object. No reflection probe will take effect on this object. Please create a new reflection probe or move existing ones closer.
+There is no reflection probe in the scene or no probe is near the current object. No reflection probe will take effect on this object. Please create a new reflection probe or move existing ones closer.
+
+### 16303
+
+Skin material needs floating-point render target, please check ENABLE_FLOAT_OUTPUT define in Project Settings--Macro
+
+### 16304
+
+Skin material may need more accurate calculations, please select a head model of standard size, check the isGlobalStandardSkinObject option in the MeshRender component.

cocos/3d/framework/mesh-renderer.ts

@@ -307,6 +307,9 @@ export class MeshRenderer extends ModelRenderer {
     @serializable
     protected _reflectionProbeBlendWeight = 0;
 
+    @serializable
+    protected _enabledGlobalStandardSkinObject = false;
+
     protected _reflectionProbeDataMap: Texture2D | null = null;
 
     // @serializable
@@ -482,6 +485,29 @@ export class MeshRenderer extends ModelRenderer {
         this._enableMorph = value;
     }
 
+    /**
+     * @en local shadow normal bias for real time lighting.
+     * @zh 实时光照下模型局部的阴影法线偏移。
+     */
+    @type(CCBoolean)
+    @tooltip('i18n:model.standard_skin_model')
+    @disallowAnimation
+    get isGlobalStandardSkinObject () {
+        return this._enabledGlobalStandardSkinObject;
+    }
+
+    set isGlobalStandardSkinObject (val) {
+        cclegacy.director.root.pipeline.pipelineSceneData.standardSkinModel = val ? this : null;
+        this._enabledGlobalStandardSkinObject = val;
+    }
+
+    /**
+     * @engineInternal
+     */
+    public clearGlobalStandardSkinObjectFlag () {
+        this._enabledGlobalStandardSkinObject = false;
+    }
+
     protected _modelType: typeof scene.Model;
 
     protected _model: scene.Model | null = null;
@@ -876,7 +902,7 @@ export class MeshRenderer extends ModelRenderer {
         if (!mainLight) { return; }
         const visibility = mainLight.visibility;
         if (!mainLight.node) { return; }
-        
+
         if (mainLight.node.mobility === MobilityMode.Static) {
             let forceClose = false;
             if (this.bakeSettings.texture && !this.node.scene.globals.disableLightmap) {
@@ -885,7 +911,7 @@ export class MeshRenderer extends ModelRenderer {
             if (this.node.scene.globals.lightProbeInfo.data
                 && this.node.scene.globals.lightProbeInfo.data.hasCoefficients()
                 && this._model.useLightProbe) {
-                    forceClose = true;
+                forceClose = true;
             }
 
             this.onUpdateReceiveDirLight(visibility, forceClose);
@@ -1009,6 +1035,7 @@ export class MeshRenderer extends ModelRenderer {
     protected _onMaterialModified (idx: number, material: Material | null) {
         if (!this._model || !this._model.inited) { return; }
         this._onRebuildPSO(idx, material || this._getBuiltinMaterial());
+        this._updateStandardSkin();
     }
 
     /**
@@ -1225,6 +1252,12 @@ export class MeshRenderer extends ModelRenderer {
     private _uploadSubMeshShapesWeights (subMeshIndex: number) {
         this._morphInstance?.setWeights(subMeshIndex, this._subMeshShapesWeights[subMeshIndex]);
     }
+
+    private _updateStandardSkin () {
+        if (this._enabledGlobalStandardSkinObject) {
+            cclegacy.director.root.pipeline.pipelineSceneData.standardSkinModel = this;
+        }
+    }
 }
 
 export declare namespace MeshRenderer {

cocos/3d/lights/directional-light-component.ts

@@ -28,7 +28,7 @@ import { scene } from '../../render-scene';
 import { cclegacy, clamp, warnID, CCBoolean, CCFloat, _decorator, settings, Settings, CCInteger } from '../../core';
 import { Camera, PCFType, Shadows, ShadowType, CSMOptimizationMode, CSMLevel } from '../../render-scene/scene';
 import { Root } from '../../root';
-import { MeshRenderer } from '../framework';
+import { MeshRenderer } from '../framework/mesh-renderer';
 import { director } from '../../game/director';
 import { rangeMin } from '../../core/data/decorators';
 

cocos/animation/animation-clip.ts

@@ -238,8 +238,17 @@ export class AnimationClip extends Asset {
         this._exoticAnimation = value;
     }
 
+    /**
+     * Gets if this animation clip contains additive animation.
+     * @experimental
+     */
+    get isAdditive_experimental () {
+        return this._additiveSettings.enabled;
+    }
+
     /**
      * Accesses the additive animation settings.
+     * @internal
      */
     get [additiveSettingsTag] () {
         return this._additiveSettings;
@@ -1009,7 +1018,10 @@ export class AnimationClip extends Asset {
 @ccclass('cc.AnimationClipAdditiveSettings')
 class AdditiveSettings {
     @serializable
-    base: AnimationClip | null = null;
+    public enabled = false;
+
+    @serializable
+    public refClip: AnimationClip | null = null;
 }
 
 export { AdditiveSettings as AnimationClipAdditiveSettings };

cocos/animation/marionette/animation-graph-animation-clip-binding.ts

@@ -2,14 +2,15 @@ import { DEBUG } from 'internal:constants';
 import { error, Quat, RealCurve, Vec3, warnID } from '../../core';
 import { assertIsTrue } from '../../core/data/utils/asserts';
 import { Node } from '../../scene-graph/node';
-import { AnimationClip, exoticAnimationTag } from '../animation-clip';
+import { additiveSettingsTag, AnimationClip, exoticAnimationTag } from '../animation-clip';
 import { AuxiliaryCurveEntry } from '../auxiliary-curve-entry';
 import { AuxiliaryCurveHandle, TransformHandle } from '../core/animation-handle';
-import { Pose } from '../core/pose';
+import { calculateDeltaPose, Pose } from '../core/pose';
 import { createEvalSymbol } from '../define';
 import { ExoticTrsAGEvaluation } from '../exotic-animation/exotic-animation';
 import { isTrsPropertyName, normalizedFollowTag, Track, TrackBinding, trackBindingTag, TrackEval } from '../tracks/track';
 import { UntypedTrack } from '../tracks/untyped-track';
+import { AnimationGraphEvaluationContext } from './animation-graph-context';
 
 /**
  * This module contains utilities to marry animation clip with animation graph.
@@ -317,7 +318,32 @@ class AuxiliaryCurveEvaluation {
 /**
  * Describes the evaluation of a animation clip in sense of animation graph.
  */
-export class AnimationClipAGEvaluation {
+export interface AnimationClipAGEvaluation {
+    /**
+     * Destroys all the track evaluations and exotic animation evaluation.
+     */
+    destroy(): void;
+
+    /**
+     * Evaluates.
+     * @param time The time.
+     * @param context The evaluation context.
+     */
+    evaluate(time: number, context: AnimationGraphEvaluationContext): Pose;
+}
+
+export function createAnimationAGEvaluation (
+    clip: AnimationClip,
+    context: AnimationClipGraphBindingContext,
+): AnimationClipAGEvaluation {
+    if (clip.isAdditive_experimental) {
+        return new AnimationClipAGEvaluationAdditive(clip, context);
+    } else {
+        return new AnimationClipAGEvaluationRegular(clip, context);
+    }
+}
+
+class AnimationClipAGEvaluationRegular implements AnimationClipAGEvaluation {
     constructor (
         clip: AnimationClip,
         context: AnimationClipGraphBindingContext,
@@ -372,9 +398,6 @@ export class AnimationClipAGEvaluation {
         this._auxiliaryCurveEvaluations = auxiliaryCurveEvaluations;
     }
 
-    /**
-     * Destroys all the track evaluations and exotic animation evaluation.
-     */
     public destroy () {
         this._exoticAnimationEvaluation?.destroy();
 
@@ -387,19 +410,14 @@ export class AnimationClipAGEvaluation {
         }
     }
 
-    /**
-     * Evaluates.
-     * @param time The time.
-     * @param context The evaluation context.
-     */
-    public evaluate (time: number, context: AnimationClipGraphEvaluationContext) {
+    public evaluate (time: number, context: AnimationGraphEvaluationContext) {
         const {
             _trackEvaluations: trackEvaluations,
             _exoticAnimationEvaluation: exoticAnimationEvaluation,
             _auxiliaryCurveEvaluations: auxiliaryCurveEvaluations,
         } = this;
 
-        const pose = context;
+        const pose = context.pushDefaultedPose();
 
         const nTrackEvaluations = trackEvaluations.length;
         for (let iNodeEvaluation = 0; iNodeEvaluation < nTrackEvaluations; ++iNodeEvaluation) {
@@ -412,8 +430,10 @@ export class AnimationClipAGEvaluation {
 
         const nAuxiliaryCurveEvaluations = auxiliaryCurveEvaluations.length;
         for (let iAuxiliaryCurveEvaluation = 0; iAuxiliaryCurveEvaluation < nAuxiliaryCurveEvaluations; ++iAuxiliaryCurveEvaluation) {
-            auxiliaryCurveEvaluations[iAuxiliaryCurveEvaluation].evaluate(time, context);
+            auxiliaryCurveEvaluations[iAuxiliaryCurveEvaluation].evaluate(time, pose);
         }
+
+        return pose;
     }
 
     private _trackEvaluations: AGTrackEvaluation<any>[] = [];
@@ -422,3 +442,48 @@ export class AnimationClipAGEvaluation {
 
     private _auxiliaryCurveEvaluations: AuxiliaryCurveEvaluation[] = [];
 }
+
+class AnimationClipAGEvaluationAdditive implements AnimationClipAGEvaluation {
+    constructor (
+        clip: AnimationClip,
+        context: AnimationClipGraphBindingContext,
+    ) {
+        this._clipEval = new AnimationClipAGEvaluationRegular(clip, context);
+        const refClip = clip[additiveSettingsTag].refClip;
+        if (refClip && refClip !== clip) {
+            this._refClipEval = new AnimationClipAGEvaluationRegular(refClip, context);
+        }
+    }
+
+    public destroy () {
+        this._clipEval.destroy();
+        this._refClipEval?.destroy();
+    }
+
+    /**
+     * Evaluates.
+     * @param time The time.
+     * @param context The evaluation context.
+     */
+    public evaluate (time: number, context: AnimationGraphEvaluationContext) {
+        // Evaluate this clip.
+        const pose = this._clipEval.evaluate(time, context);
+
+        let refPose: Pose;
+        if (this._refClipEval) {
+            const refClipTime = 0.0; // TODO: ref clip may specify a time?
+            refPose = this._refClipEval.evaluate(refClipTime, context);
+        } else {
+            // If the ref clip is not specified,
+            // The effect is as if the ref pose is the 0 time of original clip.
+            refPose = this._clipEval.evaluate(0.0, context);
+        }
+        calculateDeltaPose(pose, refPose);
+        context.popPose();
+
+        return pose;
+    }
+
+    private _clipEval: AnimationClipAGEvaluationRegular;
+    private _refClipEval: AnimationClipAGEvaluationRegular | undefined;
+}