@galacean/effects 1.2.1 → 1.2.3
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/index.js +28 -5
- package/dist/index.js.map +1 -1
- package/dist/index.min.js +3 -3
- package/dist/index.min.js.map +1 -1
- package/dist/index.mjs +28 -5
- package/dist/index.mjs.map +1 -1
- package/dist/player.d.ts +1 -2
- package/dist/weapp.js +27 -4
- package/dist/weapp.js.map +1 -1
- package/dist/weapp.mjs +27 -4
- package/dist/weapp.mjs.map +1 -1
- package/package.json +3 -3
package/dist/index.mjs
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Description: Galacean Effects runtime player for the web
|
|
4
4
|
* Author: Ant Group CO., Ltd.
|
|
5
5
|
* Contributors: 燃然,飂兮,十弦,云垣,茂安,意绮
|
|
6
|
-
* Version: v1.2.
|
|
6
|
+
* Version: v1.2.3
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
9
|
/******************************************************************************
|
|
@@ -19968,9 +19968,10 @@ var TextItem = /** @class */ (function (_super) {
|
|
|
19968
19968
|
if (this.textStyle.fontSize === value) {
|
|
19969
19969
|
return;
|
|
19970
19970
|
}
|
|
19971
|
+
// 保证字号变化后位置正常
|
|
19972
|
+
var diff = this.textStyle.fontSize - value;
|
|
19973
|
+
this.textLayout.lineHeight += diff;
|
|
19971
19974
|
this.textStyle.fontSize = value;
|
|
19972
|
-
// 1.5175 = 31.43 / 20
|
|
19973
|
-
this.textLayout.lineHeight = this.textStyle.fontSize * 1.5175;
|
|
19974
19975
|
this.isDirty = true;
|
|
19975
19976
|
};
|
|
19976
19977
|
/**
|
|
@@ -23465,6 +23466,26 @@ var AssetManager = /** @class */ (function () {
|
|
|
23465
23466
|
var _a = options.timeout, timeout = _a === void 0 ? 10 : _a;
|
|
23466
23467
|
this.timeout = timeout;
|
|
23467
23468
|
};
|
|
23469
|
+
/**
|
|
23470
|
+
* 根据用户传入的参数修改场景数据
|
|
23471
|
+
*/
|
|
23472
|
+
AssetManager.prototype.updateSceneData = function (compositions) {
|
|
23473
|
+
var variables = this.options.variables;
|
|
23474
|
+
if (!variables || Object.keys(variables).length <= 0) {
|
|
23475
|
+
return compositions;
|
|
23476
|
+
}
|
|
23477
|
+
compositions.forEach(function (composition) {
|
|
23478
|
+
composition.items.forEach(function (item) {
|
|
23479
|
+
if (item.type === ItemType$1.text) {
|
|
23480
|
+
var textVariable = variables[item.name];
|
|
23481
|
+
if (textVariable) {
|
|
23482
|
+
item.content.options.text = textVariable;
|
|
23483
|
+
}
|
|
23484
|
+
}
|
|
23485
|
+
});
|
|
23486
|
+
});
|
|
23487
|
+
return compositions;
|
|
23488
|
+
};
|
|
23468
23489
|
/**
|
|
23469
23490
|
* 场景创建,通过 json 创建出场景对象,并进行提前编译等工作
|
|
23470
23491
|
* @param url - json 的 URL 链接或者 json 对象
|
|
@@ -23556,6 +23577,7 @@ var AssetManager = /** @class */ (function () {
|
|
|
23556
23577
|
for (i = 0; i < scene.images.length; i++) {
|
|
23557
23578
|
scene.textureOptions[i].image = scene.images[i];
|
|
23558
23579
|
}
|
|
23580
|
+
scene.jsonScene.compositions = this.updateSceneData(scene.jsonScene.compositions);
|
|
23559
23581
|
_e.label = 5;
|
|
23560
23582
|
case 5: return [3 /*break*/, 12];
|
|
23561
23583
|
case 6: return [4 /*yield*/, hookTimeInfo('processJSON', function () { return _this.processJSON(rawJSON); })];
|
|
@@ -23575,6 +23597,7 @@ var AssetManager = /** @class */ (function () {
|
|
|
23575
23597
|
return [4 /*yield*/, hookTimeInfo('processTextures', function () { return _this.processTextures(loadedImages_1, loadedBins_1, jsonScene_1); })];
|
|
23576
23598
|
case 10:
|
|
23577
23599
|
loadedTextures = _e.sent();
|
|
23600
|
+
jsonScene_1.compositions = this.updateSceneData(jsonScene_1.compositions);
|
|
23578
23601
|
scene = {
|
|
23579
23602
|
url: url,
|
|
23580
23603
|
renderLevel: this.options.renderLevel,
|
|
@@ -30289,7 +30312,7 @@ var Player = /** @class */ (function () {
|
|
|
30289
30312
|
}());
|
|
30290
30313
|
function isSceneWithOptions(scene) {
|
|
30291
30314
|
// TODO: 判断不太优雅,后期试情况优化
|
|
30292
|
-
return isObject(scene) && 'scene' in scene;
|
|
30315
|
+
return isObject(scene) && 'scene' in scene && 'options' in scene;
|
|
30293
30316
|
}
|
|
30294
30317
|
/**
|
|
30295
30318
|
* 禁止/允许创建新的播放器,已创建的不受影响
|
|
@@ -30419,7 +30442,7 @@ Renderer.create = function (canvas, framework, renderOptions) {
|
|
|
30419
30442
|
Engine.create = function (gl) {
|
|
30420
30443
|
return new GLEngine(gl);
|
|
30421
30444
|
};
|
|
30422
|
-
var version = "1.2.
|
|
30445
|
+
var version = "1.2.3";
|
|
30423
30446
|
logger.info('player version: ' + version);
|
|
30424
30447
|
|
|
30425
30448
|
export { AbstractPlugin, AssetManager, BYTES_TYPE_MAP, BezierSegments, COMPRESSED_TEXTURE, COPY_FRAGMENT_SHADER, COPY_MESH_SHADER_ID, COPY_VERTEX_SHADER, CalculateItem, CalculateLoader, CalculateVFXItem, Camera, CameraController, CameraVFXItem, CameraVFXItemLoader, Composition, CompositionSourceManager, CurveValue, DEFAULT_FONTS, DestroyOptions, Downloader, EFFECTS_COPY_MESH_NAME, EVENT_TYPE_CLICK, EVENT_TYPE_TOUCH_END, EVENT_TYPE_TOUCH_MOVE, EVENT_TYPE_TOUCH_START, Engine, EventSystem, FILTER_NAME_NONE, FilterMode, FilterSpriteVFXItem, Float16ArrayWrapper, FrameBuffer, GLEngine, GLGeometry, GLRenderer, GLSLVersion, GPUCapability, Geometry, GlobalUniforms, GradientValue, HELP_LINK$1 as HELP_LINK, HitTestType, InteractBehavior$1 as InteractBehavior, InteractItem, InteractLoader, InteractMesh, InteractVFXItem, Item, KTXTexture, LineSegments, LinearValue, Material, MaterialDataBlock, MaterialRenderType, Mesh, OrderType, PLAYER_OPTIONS_ENV_EDITOR, POST_PROCESS_SETTINGS, ParticleLoader, ParticleMesh, ParticleSystem, ParticleVFXItem, PassTextureCache, PathSegments, Player, PluginSystem, QCanvasViewer, QText, QTextWrapMode, RENDER_PASS_NAME_PREFIX, RENDER_PREFER_LOOKUP_TEXTURE, RUNTIME_ENV, RandomSetValue, RandomValue, RandomVectorValue, RenderBuffer, RenderFrame, RenderPass, RenderPassAttachmentStorageType, RenderPassDestroyAttachmentType, RenderPassPriorityNormal, RenderPassPriorityPostprocess, RenderPassPriorityPrepare, RenderTargetHandle, RenderTextureFormat, Renderer, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_0, SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_SIZE_0, SEMANTIC_PRE_COLOR_ATTACHMENT_0, SEMANTIC_PRE_COLOR_ATTACHMENT_SIZE_0, SPRITE_VERTEX_STRIDE, SemanticMap, Shader, ShaderCompileResultStatus, ShaderType, SpriteItem, SpriteLoader, SpriteMesh, SpriteVFXItem, StaticValue, TEMPLATE_USE_OFFSCREEN_CANVAS, TextItem, TextLoader, TextMesh, TextVFXItem, Texture, TextureFactory, TextureLoadAction, TextureSourceType, TextureStoreAction, Ticker, TimelineComponent, Transform, VFXItem, ValueGetter, addByOrder, addItem, addItemWithOrder, alphaFrameFrag, alphaMaskFrag, assertExist, asserts, blend, bloomMixVert, bloomThresholdVert, calculateTranslation, cameraMove_frag as cameraMoveFrag, cameraMoveVert, canvasPool, colorGradingFrag, colorStopsFromGradient, colorToArr$1 as colorToArr, combineImageTemplate, combineImageTemplate1, combineImageTemplate1Async, combineImageTemplate2, combineImageTemplate2Async, combineImageTemplateAsync, compatible_frag as compatibleFrag, compatible_vert as compatibleVert, convertAnchor, copyFrag, createCopyShader, createFilter, createFilterShaders, createGLContext, createKeyFrameMeta, createShaderWithMarcos, createShape, createVFXItem, createValueGetter, deepClone, defaultGlobalVolume, defaultPlugins, delayFrag, deserializeMipmapTexture, disableAllPlayer, distortionFrag, distortionVert, earcut, enlargeBuffer, ensureVec3, filters, findPreviousRenderPass, gaussianDown_frag as gaussianDownFrag, gaussianDownHFrag, gaussianDownVFrag, gaussianUpFrag, generateEmptyTypedArray, generateHalfFloatTexture, getActivePlayers, getBackgroundImage, getColorFromGradientStops, getConfig, getDefaultTemplateCanvasPool, getDefaultTextureFactory, getGeometryByShape, getGeometryTriangles, getImageItemRenderInfo, getKTXTextureOptions, getKeyFrameMetaByRawValue, getParticleMeshShader, getPixelRatio, getPlayerByCanvas, getPreMultiAlpha, getStandardComposition, getStandardImage, getStandardItem, getStandardJSON, getTextureSize, glContext, gpuTimer, imageDataFromColor, imageDataFromGradient, initErrors, initGLContext, integrate, interpolateColor, isAndroid, isArray, isCanvasUsedByPlayer, isFunction, isIOS, isObject, isScene, isSceneWithOptions, isSimulatorCellPhone, isString, isUniformStruct, isUniformStructArray, isWebGL2, item_define as itemDefine, itemFrag, itemFrameFrag, itemVert, loadBinary, loadBlob, loadImage, loadVideo, loadWebPOptional, logger, index as math, maxSpriteMeshItemCount, maxSpriteTextureCount, modifyMaxKeyframeShader, nearestPowerOfTwo, noop, parsePercent$1 as parsePercent, particleFrag, particleOriginTranslateMap, particleVert, pluginLoaderMap, random, registerFilter, registerFilters, registerPlugin, removeItem, requestAsync, rotateVec2, screenMeshVert, setBlendMode, setConfig, setDefaultTextureFactory, setMaskMode, setMaxSpriteMeshItemCount, setRayFromCamera, setSideMode, setSpriteMeshMaxFragmentTextures, setSpriteMeshMaxItemCountByGPU, sortByOrder, index$1 as spec, spriteMeshShaderFromFilter, spriteMeshShaderFromRenderInfo, spriteMeshShaderIdFromRenderInfo, thresholdFrag, throwDestroyedError$1 as throwDestroyedError, trailVert, translatePoint, trianglesFromRect, unregisterPlugin, valIfUndefined, value, valueDefine, vecAssign, vecFill, vecMulCombine, vecNormalize, version };
|