@galacean/engine-core 1.3.0-beta.5 → 1.3.0-beta.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +16 -15
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +16 -15
- package/dist/module.js +16 -15
- package/dist/module.js.map +1 -1
- package/package.json +3 -3
- package/types/Renderer.d.ts +4 -1
- package/types/mesh/SkinnedMeshRenderer.d.ts +1 -1
- package/types/particle/ParticleRenderer.d.ts +1 -1
package/dist/main.js
CHANGED
|
@@ -3413,7 +3413,7 @@ var rotation_over_lifetime_module = "#define GLSLIFY 1\n#if defined(RENDERER_ROL
|
|
|
3413
3413
|
|
|
3414
3414
|
var size_over_lifetime_module = "#define GLSLIFY 1\n#ifdef RENDERER_SOL_CURVE_MODE\nuniform vec2 renderer_SOLMaxCurveX[4];\n#ifdef RENDERER_SOL_IS_SEPARATE\nuniform vec2 renderer_SOLMaxCurveY[4];uniform vec2 renderer_SOLMaxCurveZ[4];\n#endif\n#ifdef RENDERER_SOL_IS_RANDOM_TWO\nuniform vec2 renderer_SOLMinCurveX[4];\n#ifdef RENDERER_SOL_IS_SEPARATE\nuniform vec2 renderer_SOLMinCurveY[4];uniform vec2 renderer_SOLMinCurveZ[4];\n#endif\n#endif\n#endif\nvec2 computeParticleSizeBillboard(in vec2 size,in float normalizedAge){\n#ifdef RENDERER_SOL_CURVE_MODE\nfloat lifeSizeX=evaluateParticleCurve(renderer_SOLMaxCurveX,normalizedAge);\n#ifdef RENDERER_SOL_IS_RANDOM_TWO\nlifeSizeX=mix(evaluateParticleCurve(renderer_SOLMinCurveX,normalizedAge),lifeSizeX,a_Random0.z);\n#endif\n#ifdef RENDERER_SOL_IS_SEPARATE\nfloat lifeSizeY=evaluateParticleCurve(renderer_SOLMaxCurveY,normalizedAge);\n#ifdef RENDERER_SOL_IS_RANDOM_TWO\nlifeSizeY=mix(evaluateParticleCurve(renderer_SOLMinCurveY,normalizedAge),lifeSizeY,a_Random0.z);\n#endif\nsize*=vec2(lifeSizeX,lifeSizeY);\n#else\nsize*=lifeSizeX;\n#endif\n#endif\nreturn size;}\n#ifdef RENDERER_MODE_MESH\nvec3 computeParticleSizeMesh(in vec3 size,in float normalizedAge){\n#ifdef RENDERER_SOL_CURVE\nsize*=evaluateParticleCurve(renderer_SOLMaxCurveX,normalizedAge);\n#endif\n#ifdef RENDERER_SOL_RANDOM_CURVES\nsize*=mix(evaluateParticleCurve(renderer_SOLMaxCurveX,normalizedAge),evaluateParticleCurve(u_SOLSizeGradientMax,normalizedAge),a_Random0.z);\n#endif\n#ifdef RENDERER_SOL_CURVE_SEPARATE\nsize*=vec3(evaluateParticleCurve(renderer_SOLMinCurveX,normalizedAge),evaluateParticleCurve(renderer_SOLMinCurveY,normalizedAge),evaluateParticleCurve(renderer_SOLMinCurveZ,normalizedAge));\n#endif\n#ifdef RENDERER_SOL_RANDOM_CURVES_SEPARATE\nsize*=vec3(mix(evaluateParticleCurve(renderer_SOLMinCurveX,normalizedAge),evaluateParticleCurve(renderer_SOLMaxCurveX,normalizedAge),a_Random0.z),mix(evaluateParticleCurve(renderer_SOLMinCurveY,normalizedAge),evaluateParticleCurve(renderer_SOLMaxCurveY,normalizedAge),a_Random0.z),mix(evaluateParticleCurve(renderer_SOLMinCurveZ,normalizedAge),evaluateParticleCurve(renderer_SOLMaxCurveZ,normalizedAge),a_Random0.z));\n#endif\nreturn size;}\n#endif\n"; // eslint-disable-line
|
|
3415
3415
|
|
|
3416
|
-
var color_over_lifetime_module = "#define GLSLIFY 1\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nuniform vec4 renderer_COLMaxGradientColor[4];uniform vec2 renderer_COLMaxGradientAlpha[4];\n#ifdef RENDERER_COL_RANDOM_GRADIENTS\nuniform vec4 renderer_COLMinGradientColor[4];uniform vec2 renderer_COLMinGradientAlpha[4];\n#endif\nuniform vec4 renderer_COLGradientKeysMaxTime;\n#endif\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nvec4 evaluateParticleGradient(in vec4 colorKeys[4],in float colorKeysMaxTime,in vec2 alphaKeys[4],in float alphaKeysMaxTime,in float normalizedAge){vec4 value;float alphaAge=min(normalizedAge,alphaKeysMaxTime);for(int i=0;i<4;i++){vec2 key=alphaKeys[i];float time=key.x;if(alphaAge<=time){if(i==0){value.a=
|
|
3416
|
+
var color_over_lifetime_module = "#define GLSLIFY 1\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nuniform vec4 renderer_COLMaxGradientColor[4];uniform vec2 renderer_COLMaxGradientAlpha[4];\n#ifdef RENDERER_COL_RANDOM_GRADIENTS\nuniform vec4 renderer_COLMinGradientColor[4];uniform vec2 renderer_COLMinGradientAlpha[4];\n#endif\nuniform vec4 renderer_COLGradientKeysMaxTime;\n#endif\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nvec4 evaluateParticleGradient(in vec4 colorKeys[4],in float colorKeysMaxTime,in vec2 alphaKeys[4],in float alphaKeysMaxTime,in float normalizedAge){vec4 value;float alphaAge=min(normalizedAge,alphaKeysMaxTime);for(int i=0;i<4;i++){vec2 key=alphaKeys[i];float time=key.x;if(alphaAge<=time){if(i==0){value.a=alphaKeys[0].y;}else{vec2 lastKey=alphaKeys[i-1];float lastTime=lastKey.x;float age=(alphaAge-lastTime)/(time-lastTime);value.a=mix(lastKey.y,key.y,age);}break;}}float colorAge=min(normalizedAge,colorKeysMaxTime);for(int i=0;i<4;i++){vec4 key=colorKeys[i];float time=key.x;if(colorAge<=time){if(i==0){value.rgb=colorKeys[0].yzw;}else{vec4 lastKey=colorKeys[i-1];float lastTime=lastKey.x;float age=(colorAge-lastTime)/(time-lastTime);value.rgb=mix(lastKey.yzw,key.yzw,age);}break;}}return value;}\n#endif\nvec4 computeParticleColor(in vec4 color,in float normalizedAge){\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\nvec4 gradientColor=evaluateParticleGradient(renderer_COLMaxGradientColor,renderer_COLGradientKeysMaxTime.z,renderer_COLMaxGradientAlpha,renderer_COLGradientKeysMaxTime.w,normalizedAge);\n#endif\n#ifdef RENDERER_COL_RANDOM_GRADIENTS\ngradientColor=mix(evaluateParticleGradient(renderer_COLMinGradientColor,renderer_COLGradientKeysMaxTime.x,renderer_COLMinGradientAlpha,renderer_COLGradientKeysMaxTime.y,normalizedAge),gradientColor,a_Random0.y);\n#endif\n#if defined(RENDERER_COL_GRADIENT) || defined(RENDERER_COL_RANDOM_GRADIENTS)\ncolor*=gradientColor;\n#endif\nreturn color;}"; // eslint-disable-line
|
|
3417
3417
|
|
|
3418
3418
|
var texture_sheet_animation_module = "#define GLSLIFY 1\n#if defined(RENDERER_TSA_FRAME_CURVE) || defined(RENDERER_TSA_FRAME_RANDOM_CURVES)\nuniform float renderer_TSACycles;uniform vec3 renderer_TSATillingParams;uniform vec2 renderer_TSAFrameMaxCurve[4];\n#endif\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nuniform vec2 renderer_TSAFrameMinCurve[4];\n#endif\nvec2 computeParticleUV(in vec2 uv,in float normalizedAge){\n#if defined(RENDERER_TSA_FRAME_CURVE) || defined(RENDERER_TSA_FRAME_RANDOM_CURVES)\nfloat scaledNormalizedAge=normalizedAge*renderer_TSACycles;float cycleNormalizedAge=scaledNormalizedAge-floor(scaledNormalizedAge);float normalizedFrame=evaluateParticleCurve(renderer_TSAFrameMaxCurve,cycleNormalizedAge);\n#ifdef RENDERER_TSA_FRAME_RANDOM_CURVES\nnormalizedFrame=mix(evaluateParticleCurve(renderer_TSAFrameMinCurve,cycleNormalizedAge),normalizedFrame,a_Random1.x);\n#endif\nfloat frame=floor(normalizedFrame*renderer_TSATillingParams.z);float totalULength=frame*renderer_TSATillingParams.x;float floorTotalULength=floor(totalULength);uv.x+=totalULength-floorTotalULength;uv.y+=floorTotalULength*renderer_TSATillingParams.y;\n#endif\nreturn uv;}"; // eslint-disable-line
|
|
3419
3419
|
|
|
@@ -5984,6 +5984,9 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
|
|
|
5984
5984
|
/**
|
|
5985
5985
|
* @internal
|
|
5986
5986
|
*/ _proto._prepareRender = function _prepareRender(context) {
|
|
5987
|
+
if (this._renderFrameCount !== this.engine.time.frameCount) {
|
|
5988
|
+
this._update(context);
|
|
5989
|
+
}
|
|
5987
5990
|
var virtualCamera = context.virtualCamera;
|
|
5988
5991
|
var cameraPosition = virtualCamera.position;
|
|
5989
5992
|
var boundsCenter = this.bounds.getCenter(exports.Renderer._tempVector0);
|
|
@@ -5993,10 +5996,6 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
|
|
|
5993
5996
|
} else {
|
|
5994
5997
|
this._distanceForSort = engineMath.Vector3.distanceSquared(boundsCenter, cameraPosition);
|
|
5995
5998
|
}
|
|
5996
|
-
// Update once per frame per renderer, not influenced by batched
|
|
5997
|
-
if (this._renderFrameCount !== this.engine.time.frameCount) {
|
|
5998
|
-
this._updateRendererShaderData(context);
|
|
5999
|
-
}
|
|
6000
5999
|
this._render(context);
|
|
6001
6000
|
// union camera global macro and renderer macro.
|
|
6002
6001
|
ShaderMacroCollection.unionCollection(context.camera._globalShaderMacro, this.shaderData._macroCollection, this._globalShaderMacro);
|
|
@@ -6050,7 +6049,9 @@ exports.Renderer = (_Renderer = /*#__PURE__*/ function(Component1) {
|
|
|
6050
6049
|
/**
|
|
6051
6050
|
* @internal
|
|
6052
6051
|
*/ _proto._batch = function _batch(elementA, elementB) {};
|
|
6053
|
-
|
|
6052
|
+
/**
|
|
6053
|
+
* Update once per frame per renderer, not influenced by batched.
|
|
6054
|
+
*/ _proto._update = function _update(context) {
|
|
6054
6055
|
var layer = this.entity.layer;
|
|
6055
6056
|
this._rendererLayer.set(layer & 65535, layer >>> 16 & 65535, 0, 0);
|
|
6056
6057
|
};
|
|
@@ -18298,7 +18299,7 @@ var SkinUpdateFlag;
|
|
|
18298
18299
|
}
|
|
18299
18300
|
this._blendShapeWeights && (target._blendShapeWeights = this._blendShapeWeights.slice());
|
|
18300
18301
|
};
|
|
18301
|
-
_proto.
|
|
18302
|
+
_proto._update = function _update(context) {
|
|
18302
18303
|
var _skin, _skin1;
|
|
18303
18304
|
var skin = this.skin;
|
|
18304
18305
|
if (((_skin = skin) == null ? void 0 : _skin.bones.length) > 0) {
|
|
@@ -18347,7 +18348,7 @@ var SkinUpdateFlag;
|
|
|
18347
18348
|
this._jointTexture.setPixelBuffer(skin._skinMatrices);
|
|
18348
18349
|
}
|
|
18349
18350
|
}
|
|
18350
|
-
MeshRenderer1.prototype.
|
|
18351
|
+
MeshRenderer1.prototype._update.call(this, context);
|
|
18351
18352
|
};
|
|
18352
18353
|
/**
|
|
18353
18354
|
* @internal
|
|
@@ -30178,12 +30179,6 @@ exports.ParticleStopMode = void 0;
|
|
|
30178
30179
|
if (!this._supportInstancedArrays) {
|
|
30179
30180
|
return;
|
|
30180
30181
|
}
|
|
30181
|
-
var generator = this.generator;
|
|
30182
|
-
generator._update(this.engine.time.deltaTime);
|
|
30183
|
-
// No particles to render
|
|
30184
|
-
if (generator._firstActiveElement === generator._firstFreeElement) {
|
|
30185
|
-
return;
|
|
30186
|
-
}
|
|
30187
30182
|
Renderer1.prototype._prepareRender.call(this, context);
|
|
30188
30183
|
};
|
|
30189
30184
|
/**
|
|
@@ -30213,7 +30208,13 @@ exports.ParticleStopMode = void 0;
|
|
|
30213
30208
|
generator._updateBoundsSimulationWorld(worldBounds);
|
|
30214
30209
|
}
|
|
30215
30210
|
};
|
|
30216
|
-
_proto.
|
|
30211
|
+
_proto._update = function _update(context) {
|
|
30212
|
+
var generator = this.generator;
|
|
30213
|
+
generator._update(this.engine.time.deltaTime);
|
|
30214
|
+
// No particles to render
|
|
30215
|
+
if (generator._firstActiveElement === generator._firstFreeElement) {
|
|
30216
|
+
return;
|
|
30217
|
+
}
|
|
30217
30218
|
var shaderData = this.shaderData;
|
|
30218
30219
|
shaderData.setFloat(ParticleRenderer._lengthScale, this.lengthScale);
|
|
30219
30220
|
shaderData.setFloat(ParticleRenderer._speedScale, this.velocityScale);
|