From d8fae04290640ed617b05402b20fc56434d25e74 Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Tue, 9 Apr 2024 21:09:14 +0900 Subject: [PATCH 1/2] fix: rollback constraint activeness optimization --- Editor/APIInternal/ComponentInfos.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Editor/APIInternal/ComponentInfos.cs b/Editor/APIInternal/ComponentInfos.cs index ede9a0e31..7c8af8142 100644 --- a/Editor/APIInternal/ComponentInfos.cs +++ b/Editor/APIInternal/ComponentInfos.cs @@ -330,15 +330,17 @@ protected override void CollectDependency(T component, ComponentDependencyCollec .EvenIfDependantDisabled(); for (var i = 0; i < component.sourceCount; i++) collector.AddDependency(component.GetSource(i).sourceTransform); - var isNestedConstraint = - component.GetComponentsInChildren() != null && - component.GetComponentsInParent() != null; + //var isNestedConstraint = + // component.GetComponentsInChildren() != null && + // component.GetComponentsInParent() != null; // for nested constraint, our optimizer may breaks the constraint // https://github.com/anatawa12/AvatarOptimizer/issues/856 - if (isNestedConstraint) - collector.MarkBehaviour(); - else - collector.MarkHeavyBehaviour(); + //if (isNestedConstraint) + // collector.MarkBehaviour(); + //else + // collector.MarkHeavyBehaviour(); + // It's too buggy. the Constraint is too complex. + collector.MarkBehaviour(); } } From 23f153ea3d6281275120290f079f44c1dbedfebf Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Tue, 9 Apr 2024 21:13:56 +0900 Subject: [PATCH 2/2] docs(changelog): Activeness Optimization for Constraint component --- CHANGELOG-PRERELEASE.md | 2 ++ CHANGELOG.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md index 0b2b56629..dc5deb9ff 100644 --- a/CHANGELOG-PRERELEASE.md +++ b/CHANGELOG-PRERELEASE.md @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog]. ### Deprecated ### Removed +- Activeness Optimization for Constraint component `#996` + - The constraint component is too complex to optimize correctly and reliably ### Fixed diff --git a/CHANGELOG.md b/CHANGELOG.md index 36d9ec8b3..c0e2d3d2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog]. ### Deprecated ### Removed +- Activeness Optimization for Constraint component `#996` + - The constraint component is too complex to optimize correctly and reliably ### Fixed