Ma/ueblueprint
1
0
Fork 0
mirror of https://github.com/barsdeveloper/ueblueprint.git synced 2026-05-14 07:47:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix niagara script variables merging

Browse Source
This commit is contained in:
barsdeveloper
2024-12-16 23:45:56 +02:00
parent c0032fed76
commit 3b68fb46a8
6 changed files with 169 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dist/ueblueprint.js vendored
View File

@@ -3866,9 +3866,9 @@ class MirroredEntity extends IEntity {
} }
/** @returns {InstanceType<T>} */ /** @returns {InstanceType<T>} */
valueOf() { valueOf(arg) {
// @ts-expect-error // @ts-expect-error
return this.getter().valueOf() return this.getter(arg).valueOf()
} }
toString() { toString() {
@@ -6654,18 +6654,18 @@ class ObjectEntity extends IEntity {
} }
/** @type {ObjectEntity} */ /** @type {ObjectEntity} */
const subObject = this[k]; const subObject = this[k];
if (!subObject.ExportPath?.valueOf().path.includes(this.Name.toString())) { if (!subObject.ExportPath?.valueOf(this).path.includes(this.Name.toString())) {
continue continue
} }
const originalExportPath = subObject.ExportPath.valueOf(); const originalExportPath = subObject.ExportPath.valueOf(this);
const position = originalExportPath.path.indexOf(this.Name.toString()); const position = originalExportPath.path.indexOf(this.Name.toString());
const prefix = originalExportPath.path.substring(0, position); const prefix = originalExportPath.path.substring(0, position);
const suffix = originalExportPath.path.substring(position + this.Name.toString().length); const suffix = originalExportPath.path.substring(position + this.Name.toString().length);
const mirroredEntity = /** @type {typeof ObjectEntity} */(subObject.constructor).attributes.ExportPath; const mirroredEntity = /** @type {typeof ObjectEntity} */(subObject.constructor).attributes.ExportPath;
subObject.ExportPath = new mirroredEntity( subObject.ExportPath = new mirroredEntity(
() => new (mirroredEntity.type)( (self = this) => new (mirroredEntity.type)(
originalExportPath.type, originalExportPath.type,
prefix + (this.Name ?? "").toString() + suffix, prefix + (self.Name ?? "").toString() + suffix,
originalExportPath.full originalExportPath.full
) )
); );
@@ -10288,6 +10288,13 @@ class BlueprintEntity extends ObjectEntity {
ScriptVariables: super.attributes.ScriptVariables.asUniqueClass(true).withDefault(), ScriptVariables: super.attributes.ScriptVariables.asUniqueClass(true).withDefault(),
} }
constructor(...args) {
super(...args);
if (!this.Name) {
this.Name = new (/** @type {typeof ObjectEntity} */(this.constructor).attributes.Name)("Blueprint");
}
}
/** @param {ObjectEntity} entity */ /** @param {ObjectEntity} entity */
getHomonymObjectEntity(entity) { getHomonymObjectEntity(entity) {
const name = entity.getObjectName(); const name = entity.getObjectName();

2
dist/ueblueprint.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
js/entity/BlueprintEntity.js
View File

@@ -19,6 +19,13 @@ export default class BlueprintEntity extends ObjectEntity {
ScriptVariables: super.attributes.ScriptVariables.asUniqueClass(true).withDefault(), ScriptVariables: super.attributes.ScriptVariables.asUniqueClass(true).withDefault(),
} }
constructor(...args) {
super(...args)
if (!this.Name) {
this.Name = new (/** @type {typeof ObjectEntity} */(this.constructor).attributes.Name)("Blueprint")
}
}
/** @param {ObjectEntity} entity */ /** @param {ObjectEntity} entity */
getHomonymObjectEntity(entity) { getHomonymObjectEntity(entity) {
const name = entity.getObjectName() const name = entity.getObjectName()

4
js/entity/MirroredEntity.js
View File

@@ -67,9 +67,9 @@ export default class MirroredEntity extends IEntity {
} }
/** @returns {InstanceType<T>} */ /** @returns {InstanceType<T>} */
valueOf() { valueOf(arg) {
// @ts-expect-error // @ts-expect-error
return this.getter().valueOf() return this.getter(arg).valueOf()
} }
toString() { toString() {

8
js/entity/ObjectEntity.js
View File

@@ -389,18 +389,18 @@ export default class ObjectEntity extends IEntity {
} }
/** @type {ObjectEntity} */ /** @type {ObjectEntity} */
const subObject = this[k] const subObject = this[k]
if (!subObject.ExportPath?.valueOf().path.includes(this.Name.toString())) { if (!subObject.ExportPath?.valueOf(this).path.includes(this.Name.toString())) {
continue continue
} }
const originalExportPath = subObject.ExportPath.valueOf() const originalExportPath = subObject.ExportPath.valueOf(this)
const position = originalExportPath.path.indexOf(this.Name.toString()) const position = originalExportPath.path.indexOf(this.Name.toString())
const prefix = originalExportPath.path.substring(0, position) const prefix = originalExportPath.path.substring(0, position)
const suffix = originalExportPath.path.substring(position + this.Name.toString().length) const suffix = originalExportPath.path.substring(position + this.Name.toString().length)
const mirroredEntity = /** @type {typeof ObjectEntity} */(subObject.constructor).attributes.ExportPath const mirroredEntity = /** @type {typeof ObjectEntity} */(subObject.constructor).attributes.ExportPath
subObject.ExportPath = new mirroredEntity( subObject.ExportPath = new mirroredEntity(
() => new (mirroredEntity.type)( (self = this) => new (mirroredEntity.type)(
originalExportPath.type, originalExportPath.type,
prefix + (this.Name ?? "").toString() + suffix, prefix + (self.Name ?? "").toString() + suffix,
originalExportPath.full originalExportPath.full
) )
) )

149
tests/niagaraScriptVariables.spec.js
View File

File diff suppressed because one or more lines are too long