保存仿制图章修复与前轮发布诊断,待正式验收
这个提交包含在:
1 父节点
5a10408557
当前提交
ca9936ee3c
25 个文件已更改
+1354
-58
没有与搜索条件相匹配的文件
@@ -0,0 +1,51 @@
|
||||
{
|
||||
"state": "prepared-not-publishable",
|
||||
"articleID": 15792,
|
||||
"articleURL": "https://dayu.media/15792/",
|
||||
"versionAssigned": false,
|
||||
"format": "Editorial templates only. This is not a complete publisher request.",
|
||||
"titleTemplate": "大鱼调色 {{VERSION}} 公测版|仿制图章跟踪指引与纯色区域修复",
|
||||
"excerptTemplate": "大鱼调色 {{VERSION}}(构建 {{BUILD}})完善仿制图章操作指引:取样可跟随修复区移动,支持单独选择同一表面的跟踪参考与手工关键帧;跟踪停止后显示原因、停止时间和最后可信位置。",
|
||||
"openingParagraphTemplate": "<p>大鱼调色是适用于 Final Cut Pro 和 Motion 的原生 FxPlug 4 调色插件。{{VERSION}}(构建 {{BUILD}})完善仿制图章的创建、跟踪和失败处理指引,可用同一表面的清晰参考带动小范围修复,并通过手工关键帧继续处理自动跟踪无法完成的片段。</p>",
|
||||
"mainDownloadParagraphTemplate": "<p><strong>本文主下载已更新为 {{VERSION}}(构建 {{BUILD}})。同一个 PKG 已包含“大鱼调色”整合效果和全部 16 个独立模块效果,以及所需的完整主 App,无需另外下载安装独立模块。</strong></p>",
|
||||
"newSectionBlocks": [
|
||||
{"type": "heading", "level": 2, "htmlTemplate": "{{VERSION}} 仿制图章跟踪与操作指引"},
|
||||
{"type": "paragraph", "htmlTemplate": "<strong>干净取样区可以随修复区移动。</strong> 新建图章默认采用这一模式,不再要求干净的纯色取样区独立识别纹理。已有图章保留原来的独立跟踪模式,可在编辑面板切换;独立模式仍需要取样区和修复参考都有足够细节。"},
|
||||
{"type": "paragraph", "htmlTemplate": "<strong>跟踪参考与修复范围分开选择。</strong> 瑕疵附近缺少纹理时,点击“选择跟踪参考”,在同一运动表面上框选清晰细节。绿色框只负责跟踪,黄色椭圆决定实际修复范围。请避免选择独立运动的物体或不同景深的背景作参考。"},
|
||||
{"type": "paragraph", "htmlTemplate": "<strong>跟踪停止后可以看到原因。</strong> 画布保留失败原因、停止的片段时间和最后可信位置;首帧失败也会保存说明。已有可信轨迹时,可点击“最后可信帧”定位,校正位置或更换参考后继续处理。双向跟踪遇到实际失败会明确停止,宿主超过 30 秒没有返回新画面时也会显示说明。"},
|
||||
{"type": "paragraph", "htmlTemplate": "<strong>自动跟踪前也能建立手工关键帧。</strong> 点击“手工关键帧”,移动到另一帧后拖动黄色修复区或青色取样点,帧间自动过渡。有轨迹时,拖动取样点只修改当前帧;重新自动跟踪时保留手工设置的取样位置。"},
|
||||
{"type": "heading", "level": 3, "htmlTemplate": "纯色表面上的瑕疵怎么处理"},
|
||||
{"type": "paragraph", "htmlTemplate": "先选择亮度、颜色和纹理接近的干净取样中心,再拖出略大于瑕疵的黄色覆盖椭圆,调整羽化。污点固定在画面坐标上时直接覆盖即可;需要跟随表面运动时,使用“取样跟随修复区移动”,并为缺少细节的修复区选择同一表面的跟踪参考。"},
|
||||
{"type": "paragraph", "htmlTemplate": "如果整个运动表面都没有可供识别的细节,自动跟踪仍可能无法开始。此时按画布说明使用手工关键帧,逐段校正修复区和取样点,并播放检查修复结果。参考跟踪不会自动补画被遮挡的内容。"}
|
||||
],
|
||||
"installationParagraphTemplate": "<p>运行本文提供的 {{VERSION}} 原始 PKG。安装器会装好大鱼调色主 App、内嵌 FxPlug 插件、“大鱼调色”整合效果和全部 16 个独立模块效果,并自动登记插件。</p>",
|
||||
"seoTemplates": {
|
||||
"title": "大鱼调色 {{VERSION}} 公测版|仿制图章跟踪指引与纯色区域修复",
|
||||
"description": "大鱼调色 {{VERSION}} 适用于 Final Cut Pro 和 Motion,完善仿制图章跟踪指引、纯色取样跟随、独立参考区、手工关键帧及失败说明。完整 PKG 包含主 App、整合效果和 16 个独立模块。",
|
||||
"additionalKeywords": ["仿制图章", "纯色区域修复", "跟踪参考", "手工关键帧"]
|
||||
},
|
||||
"applyAgainstLiveArticle": {
|
||||
"required": true,
|
||||
"lastVerifiedHistoricalBaseline": "Packaging/article-1.22.1.json",
|
||||
"baselineFreshness": "Historical reference only; fetch the live article immediately before preparing the final publisher request.",
|
||||
"operations": [
|
||||
"Read authenticated current article, download fields and SEO enabled states; preserve a private baseline.",
|
||||
"Fill VERSION and BUILD only from the accepted installed Release and verified package reports.",
|
||||
"Replace the current opening summary, main download version paragraph and current installation package paragraph; do not replace historical version references globally.",
|
||||
"Insert the new section above the existing most recent update section, preserving all historical content, six images, effect names and App open command.",
|
||||
"Update title, excerpt and SEO text. Keep current SEO enabled states, commercial settings, price, member entitlements, author, categories, tags, cover and FCPX settings.",
|
||||
"Upload the exact verified package using the existing article publisher and a unique request ID; read back before retrying an unknown upload result.",
|
||||
"Replace the main package URL and original filename only after full uploaded-file download matches verified package size and SHA-256.",
|
||||
"Read back authenticated saved fields and the frontend; verify current version, install instructions, history, images, code and commercial settings."
|
||||
]
|
||||
},
|
||||
"publicationRequirements": [
|
||||
"Full Release build from a recorded recoverable source commit.",
|
||||
"APP signature, notarization Accepted, ticket and unique formal installation verified.",
|
||||
"Installed native regression and required Final Cut Pro host acceptance passed.",
|
||||
"PKG signature, notarization Accepted, ticket, Gatekeeper and package inspection passed.",
|
||||
"Source checkpoint and version tag pushed and read back; Release attachment fully downloaded and verified.",
|
||||
"Current live article baseline read; every template token replaced; package attachment fully downloaded and verified."
|
||||
],
|
||||
"acceptanceClaims": "Add only the actual new-version verification results after completion. Do not reuse 1.22.1 host acceptance or the 24 isolated clone-state checks as new-version acceptance."
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
# 仿制图章修复:待正式验收及发布
|
||||
|
||||
此为本地发布草稿。尚未生成正式版本号、签名公证、安装包或线上附件;不得用此草稿宣称已发布。须在正式安装路径的 FCP 验收通过后,才更新文章 15792、安装包与对应 Release。
|
||||
|
||||
## 更新说明草稿
|
||||
|
||||
- 新建图章默认“取样跟随修复区移动”,干净的纯色取样区域无需独立识别纹理。已有图章保留原模式,可在编辑面板切换。
|
||||
- 增加“选择跟踪参考”:可框选同一表面上有纹理的区域,用于带动小范围修复。绿色框用于跟踪,黄色椭圆仍决定实际覆盖范围。
|
||||
- 增加“手工关键帧”:自动跟踪前即可建立首个关键帧,再到其它帧调整修复区与取样点,帧间自动过渡。
|
||||
- 跟踪停止后在画布持续显示原因、停止时间和最后可信位置。即使首帧失败,关闭后重新打开仍能读取原因;可点击“最后可信帧”定位继续处理。
|
||||
- 双向跟踪在发生实际失败时明确停止;宿主长时间未返回新帧时显示超时原因。
|
||||
|
||||
## 使用说明草稿
|
||||
|
||||
1. 点击图章,选择与瑕疵亮度、颜色和纹理接近的干净取样中心,再拖出略大于瑕疵的黄色覆盖椭圆,调整羽化。
|
||||
2. 固定在画面坐标上的污点直接覆盖即可;需要随表面移动时,再启动跟踪。
|
||||
3. 修复区缺少纹理时,点击“选择跟踪参考”,在同一表面拖出包含清晰细节的绿色框。不能选择另一个独立运动物体或不同景深的背景作参考。
|
||||
4. 干净取样区为纯色时,选择“取样跟随修复区移动”;仅在取样区和修复区确实分别运动、且两者都有足够细节时,使用“取样区独立跟踪”。
|
||||
5. 自动跟踪停止后先阅读画布原因。存在可信轨迹时,点击“最后可信帧”,校正位置或重新选择参考再继续。没有可用参考时,点击“手工关键帧”,逐段设置修复位置。
|
||||
|
||||
## 发布门槛
|
||||
|
||||
- 完整 Release 构建、正式签名、公证 Accepted、票据及唯一正式安装通过。
|
||||
- 正式安装原生自检包含新增宿主回归,并且没有既有检查失败。
|
||||
- FCP 实际检查:纯色取样跟随、纯色小修复区与独立参考、首帧失败提示与冷重开、部分失败后定位、正反双向、手工修复与取样关键帧、撤销、存储及画布控件布局。
|
||||
- PKG 签名、公证、验包;Git 标签、Release 附件及完整下载校验通过。
|
||||
- 用当时的线上文章作为最新基线,仅更新版本、说明及主下载项;保留价格、会员权益、历史内容和图片,上传后完整下载校验并回读前台。
|
||||
@@ -0,0 +1,67 @@
|
||||
// Uses the production state implementation and motion mapping. No host UI,
|
||||
// registration service, GPU, account, or user footage is required.
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "../../大鱼调色/Plugin/DYToolState.h"
|
||||
#include "../../大鱼调色/Plugin/MaskCore/DYCloneTracking.hpp"
|
||||
#include "../../大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp"
|
||||
|
||||
int main(){@autoreleasepool{
|
||||
NSMutableArray *results=[NSMutableArray array];BOOL passed=YES;
|
||||
auto check=[&](NSString *name,bool pass){[results addObject:@{@"name":name,@"pass":@(pass)}];passed&=pass;};
|
||||
auto close=[](double x,double y){return std::abs(x-y)<1e-5;};
|
||||
auto stamp=DYMutablePlist(DYNewMask(DYMaskEllipse));
|
||||
DYMaskParameters p=DYMaskAtTime(stamp,kCMTimeZero);p.centerX=.6;p.centerY=.5;p.width=.04;p.height=.06;
|
||||
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];stamp[@"stampSource"]=@[@.5,@.5,@.04,@.06];
|
||||
check(@"legacy-stamp-keeps-independent-tracking",DYValidToolMask(stamp)&&!DYStampUsesLinkedTracking(stamp));
|
||||
stamp[@"stampTrackMode"]=@"linked";
|
||||
check(@"linked-stamp-mode-survives-property-list-roundtrip",DYStampUsesLinkedTracking(stamp)&&DYValidToolMask(stamp));
|
||||
auto invalid=DYMutablePlist(stamp);invalid[@"stampTrackMode"]=@"other";
|
||||
check(@"invalid-tracking-mode-rejected",!DYValidToolMask(invalid));
|
||||
auto original=DYMaskAtTime(stamp,kCMTimeZero);
|
||||
check(@"reference-selection-accepts-nearby-surface-texture",DYSetStampReference(stamp,NSMakeRect(.4,.3,.3,.4),kCMTimeZero));
|
||||
auto repair=DYMaskAtTime(stamp,kCMTimeZero),ref=DYStampReferenceAtTime(stamp,kCMTimeZero);
|
||||
check(@"reference-does-not-enlarge-or-move-repair",close(repair.centerX,original.centerX)&&close(repair.centerY,original.centerY)&&close(repair.width,original.width)&&close(repair.height,original.height));
|
||||
check(@"reference-restores-selected-rectangle",ref.kind==DYMaskRectangle&&close(ref.centerX,.55)&&close(ref.centerY,.5)&&close(ref.width,.3)&&close(ref.height,.4));
|
||||
auto tinyStamp=DYMutablePlist(stamp);auto tiny=original;tiny.width=.002;tiny.height=.003;tinyStamp[@"parameters"]=[NSData dataWithBytes:&tiny length:sizeof(tiny)];
|
||||
check(@"tiny-blemish-can-use-large-distant-reference-on-same-surface",DYSetStampReference(tinyStamp,NSMakeRect(.1,.1,.3,.4),kCMTimeZero)&&close(DYStampReferenceAtTime(tinyStamp,kCMTimeZero).width,.3)&&close(DYMaskAtTime(tinyStamp,kCMTimeZero).width,.002));
|
||||
auto before=[stamp copy];
|
||||
check(@"invalid-reference-does-not-overwrite-existing-reference",!DYSetStampReference(stamp,NSMakeRect(-.1,0,.3,.3),kCMTimeZero)&&[stamp isEqual:before]);[before release];
|
||||
auto archived=[NSPropertyListSerialization dataWithPropertyList:stamp format:NSPropertyListBinaryFormat_v1_0 options:0 error:nil];
|
||||
auto restored=[NSPropertyListSerialization propertyListWithData:archived options:NSPropertyListImmutable format:nullptr error:nil];
|
||||
check(@"reference-and-mode-persist-on-cold-read",DYValidToolMask(restored)&&DYStampUsesLinkedTracking(restored)&&[restored[@"stampReference"]isEqual:stamp[@"stampReference"]]);
|
||||
dy::TrackResult motion;motion.valid=true;motion.confidence=.9;motion.cx=.56;motion.cy=.52;
|
||||
dy::TrackerROI seed{.55,.5,.3,.4,0};
|
||||
auto target=dy::cloneRegionFollowing(motion,seed,.6,.5,16.f/9);
|
||||
auto source=dy::cloneRegionFollowing(motion,seed,.5,.5,16.f/9);
|
||||
check(@"linked-clean-source-follows-reference-translation",target.valid&&source.valid&&close(target.cx,.61)&&close(source.cx,.51)&&close(source.cy,.52));
|
||||
motion.scaleX=1.2;motion.scaleY=.8;
|
||||
target=dy::cloneRegionFollowing(motion,seed,.6,.55,2);
|
||||
check(@"separate-reference-transfers-anisotropic-scale",target.valid&&close(target.cx,.62)&&close(target.cy,.56));
|
||||
motion.rotation=float(M_PI/2);motion.scaleX=motion.scaleY=1;
|
||||
target=dy::cloneRegionFollowing(motion,seed,.65,.5,2);
|
||||
check(@"offset-centre-uses-image-aspect-during-rotation",target.valid&&close(target.cx,.56)&&close(target.cy,.72));
|
||||
motion.cx=.99;motion.cy=.5;motion.rotation=0;
|
||||
check(@"linked-source-leaving-frame-is-explicit-loss",!dy::cloneRegionFollowing(motion,seed,.7,.5,2).valid&&dy::cloneRegionFollowing(motion,seed,.7,.5,2).failure==dy::TrackFailure::OutsideFrame);
|
||||
check(@"invalid-reference-result-is-never-used",!dy::cloneRegionFollowing({},seed,.6,.5,2).valid);
|
||||
check(@"invalid-image-aspect-is-never-used",!dy::cloneRegionFollowing(motion,seed,.6,.5,0).valid);
|
||||
stamp[@"status"]=@"未开始:纹理不足";stamp[@"trackingStopped"]=@YES;
|
||||
check(@"manual-key-can-be-created-before-any-automatic-track",DYAddStampManualKey(stamp,kCMTimeZero)&&[stamp[@"keys"]count]==1&&[stamp[@"keys"][0][@"manual"]boolValue]&&!stamp[@"status"]);
|
||||
DYMaskParameters end=original;end.centerX=.7;end.centerY=.6;DYStampMotion linked;linked.active=true;linked.sourceOffsetX=.1;linked.sourceOffsetY=.1;
|
||||
check(@"manual-end-key-retains-original-sampling-origin",DYMergeTracking(stamp,@[DYStampKey(CMTimeMake(10,1),end,YES,1,linked)])&&close([stamp[@"stampSource"][0]doubleValue],.5));
|
||||
auto half=DYMaskAtTime(stamp,CMTimeMake(5,1));auto halfSource=DYStampSourceAtTime(stamp,CMTimeMake(5,1));
|
||||
check(@"manual-repair-and-source-interpolate-between-frames",close(half.centerX,.65)&&close(half.centerY,.55)&&close([halfSource[0]doubleValue],.55)&&close([halfSource[1]doubleValue],.55));
|
||||
auto halfRef=DYStampReferenceAtTime(stamp,CMTimeMake(5,1));
|
||||
check(@"reference-follows-manually-corrected-repair",close(halfRef.centerX,.6)&&close(halfRef.centerY,.55)&&close(halfRef.width,.3));
|
||||
check(@"manual-key-at-existing-time-does-not-duplicate-time",DYAddStampManualKey(stamp,CMTimeMake(10,1))&&[stamp[@"keys"]count]==2&&DYValidToolMask(stamp));
|
||||
DYStampMotion automatic=linked;automatic.sourceOffsetX=-.2;automatic.sourceOffsetY=-.1;automatic.targetScaleX=automatic.sourceScaleX=1.2;
|
||||
check(@"automatic-retracking-preserves-manually-authored-source-position",DYMergeTracking(stamp,@[DYStampKey(CMTimeMake(10,1),end,NO,1,automatic)])&&close([DYStampSourceAtTime(stamp,CMTimeMake(10,1))[0]doubleValue],.6)&&close(DYStampMotionAtTime(stamp,CMTimeMake(10,1)).targetScaleX,1.2));
|
||||
stamp[@"trackingLastTime"]=@[@1001,@24000,@0];stamp[@"trackingStopTime"]=@[@2002,@24000,@0];stamp[@"trackingStopped"]=@YES;stamp[@"status"]=@"已停止:参考区域纹理不足。选择参考或手工关键帧。";
|
||||
auto last=DYTrackingRecordedTime(stamp,@"trackingLastTime");
|
||||
check(@"failed-status-and-exact-last-frame-persist-without-new-tracks",DYValidToolMask(stamp)&&CMTimeCompare(last,CMTimeMake(1001,24000))==0);
|
||||
invalid=DYMutablePlist(stamp);invalid[@"trackingLastTime"]=@[@1,@0,@0];
|
||||
check(@"invalid-return-frame-time-rejected",!DYValidToolMask(invalid)&&!CMTIME_IS_NUMERIC(DYTrackingRecordedTime(invalid,@"trackingLastTime")));
|
||||
dy::GrayFrame flat{320,192,std::vector<float>(320*192,.5f)};dy::VisionRegionTracker tracker;
|
||||
check(@"flat-reference-remains-explicit-insufficient-texture",!tracker.reset(flat,{.5,.5,.4,.4,0})&&tracker.result().failure==dy::TrackFailure::InsufficientTexture);
|
||||
NSData *data=[NSJSONSerialization dataWithJSONObject:@{@"pass":@(passed),@"scope":@"Production clone state/motion and texture initialization; no continuous Vision registration or host UI",@"results":results} options:NSJSONWritingPrettyPrinted error:nil];
|
||||
fwrite(data.bytes,1,data.length,stdout);return passed?0:1;
|
||||
}}
|
||||
@@ -0,0 +1,54 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Isolated native clone-state checks; not a replacement for Release/FCP QA."""
|
||||
import argparse
|
||||
import json
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[2]
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description=__doc__)
|
||||
parser.add_argument('--output', type=Path)
|
||||
args = parser.parse_args()
|
||||
with tempfile.TemporaryDirectory(prefix='dayu-clone-state-') as folder:
|
||||
executable = Path(folder) / 'clone-state'
|
||||
command = [
|
||||
'xcrun', 'clang++', '-std=c++20', '-fno-objc-arc', '-fblocks',
|
||||
'-mmacosx-version-min=14.6', '-Wno-objc-method-access',
|
||||
'-F/Library/Developer/SDKs/FxPlug.sdk/Library/Frameworks',
|
||||
'-framework', 'Cocoa', '-framework', 'CoreMedia',
|
||||
'-framework', 'Vision', '-framework', 'CoreVideo', '-framework', 'FxPlug',
|
||||
# Keep unrelated colour-runtime entry points outside this isolated
|
||||
# executable. An accidental call to them fails the process.
|
||||
'-Wl,-undefined,dynamic_lookup',
|
||||
'-Wl,-rpath,/Library/Developer/Frameworks',
|
||||
str(ROOT / 'tools/tracking/verify_clone_repair.mm'),
|
||||
str(ROOT / '大鱼调色/Plugin/DYToolState.mm'),
|
||||
str(ROOT / '大鱼调色/Plugin/DYModel.mm'), '-o', str(executable),
|
||||
]
|
||||
built = subprocess.run(command, cwd=ROOT, text=True, capture_output=True)
|
||||
if built.returncode:
|
||||
sys.stderr.write(built.stderr)
|
||||
return built.returncode
|
||||
checked = subprocess.run([str(executable)], cwd=ROOT, text=True, capture_output=True)
|
||||
if checked.stderr:
|
||||
sys.stderr.write(checked.stderr)
|
||||
if not checked.stdout:
|
||||
return checked.returncode or 1
|
||||
report = json.loads(checked.stdout)
|
||||
report['compileExitCode'] = built.returncode
|
||||
report['testExitCode'] = checked.returncode
|
||||
report['hostAcceptance'] = False
|
||||
data = json.dumps(report, ensure_ascii=False, indent=2) + '\n'
|
||||
if args.output:
|
||||
args.output.write_text(data)
|
||||
print(data, end='')
|
||||
return 0 if not checked.returncode and report['pass'] else 1
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
@@ -0,0 +1,152 @@
|
||||
{
|
||||
"recordedAt": "2026-11-14T16:50:15.288928+08:00",
|
||||
"status": "Source implementation and isolated checks complete; Release/FCP acceptance and publication NOT COMPLETE",
|
||||
"userAuthorization": "Fix clone stamp tracking and guidance; update online package/article only after acceptance. No further confirmation is needed within this authorized sequence.",
|
||||
"baseCommit": "5a10408557cf4bb7dd96477ecc72829f48242a07",
|
||||
"installedVersion": "1.22.1",
|
||||
"installedBuild": "133",
|
||||
"productVersionBumped": false,
|
||||
"newReleaseCompiledSource": null,
|
||||
"releaseTag": null,
|
||||
"notarizedOrInstalled": false,
|
||||
"implementation": [
|
||||
"New stamps use linked-source tracking by default; legacy documents retain independent semantics with an explicit mode selector.",
|
||||
"A separate rectangle on the same surface can drive a small repair ellipse. Selecting reference does not enlarge the repaired pixels; normalized offset mapping accounts for image aspect, translation and X/Y scale.",
|
||||
"Canvas shows creation/edit guidance, failure reason, stop time, last credible time and concrete reference/manual actions. Failure is persisted even with zero new keys.",
|
||||
"Last credible frame navigation maps input time through the host timing API; manual entry works before any automatic track.",
|
||||
"Source drag with existing keys now authors only the current source position; earlier frames stay fixed. Manual source positions survive subsequent automatic tracking while automatic scales can still update.",
|
||||
"A bidirectional loss stops instead of reporting forward completion; 30 seconds without another host frame produces an explicit stop message.",
|
||||
"Workspace preserves a final result pane even if the first frame fails before the initial running update.",
|
||||
"Tiny repair ellipses can select a substantially larger/distant reference within the same frame; reference ratios accommodate the full frame at minimum repair size."
|
||||
],
|
||||
"sourceSHA256": {
|
||||
"大鱼调色/Plugin/DYColorWorkspace.mm": "b00b8e1727fc5398faa1aeee6c5a0a05d9e63e76a010b4180d9558392a7f1da4",
|
||||
"大鱼调色/Plugin/DYMaskPanel.inc.h": "ba31ac3dbe4abb4b0d784e19629c357e9509941aa080f81c922bac071b7f5184",
|
||||
"大鱼调色/Plugin/DYPlugIn.mm": "67c0b8e7753371c3a9164cf1149e501056f288158824173c8e747f7f5c00e32a",
|
||||
"大鱼调色/Plugin/DYToolCanvasEditing.inc.h": "58c38f3ddebf4da2b14da652499f117d5bc2c31a407078608bdabf2bed2807cc",
|
||||
"大鱼调色/Plugin/DYToolHostDeclarations.inc.h": "0b0879931028c6240006f5469f19a1590e80fe3051a0c9271ef643c1c999a011",
|
||||
"大鱼调色/Plugin/DYToolHostIvars.inc.h": "43c08958267e93756a34914c511dd3fb60d5976953b337e6978963bbcb1eb80d",
|
||||
"大鱼调色/Plugin/DYToolHostMethods.inc.h": "3cbc68fb7ffabe52b13ca6e3d4cedace8f930793eeb34cb5594d5c0864dbd088",
|
||||
"大鱼调色/Plugin/DYToolOSC.inc.h": "b5049169184f8d4240ffb809fdf86df224e2a7dc6a1d5fb5bb92a73815437b8b",
|
||||
"大鱼调色/Plugin/DYToolState.h": "0dac1087c4c5e18b43b674ff50b7be5a9b47a151401d87ca7adc1b72908bdec0",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "5ea14fa293a881cccd9a7f56f7126ea5d0c4f81217a788a06d94ea2825404688",
|
||||
"大鱼调色/Plugin/DYToolTrackingDiagnostics.inc.h": "843bfca0496d412e571b53e87cdd7317a9d4597bc4a716068e0264a75465cc80",
|
||||
"大鱼调色/Plugin/DYToolTrackingProbe.inc.h": "11512b7ac0bd562e87b05163a42b19a7cf9b0a26b37d68e64fc1e044921e8a64",
|
||||
"大鱼调色/Plugin/DYTrackingPreview.inc.h": "647b575d9b188b1a5676d715a52f3e66fab3d422a55c442b0df435bfe5300f57",
|
||||
"大鱼调色/Plugin/MaskCore/DYCloneTracking.hpp": "549602828e11fa624cc70eadeb9f09e5611c59ae78090ace0e40fcf709027468",
|
||||
"tools/tracking/verify_clone_repair.mm": "c0008e7e2b7546ba578a3cd86c6f141ca58640e36981b60f150d13be333e320b",
|
||||
"tools/tracking/verify_clone_repair.py": "3046a3efdca8a1b14f0d914a9abbd5dfd92273866dca3b01d7e06d8ab1810920"
|
||||
},
|
||||
"isolatedChecks": {
|
||||
"report": "verification/CloneRepairState-20261114.json",
|
||||
"pass": true,
|
||||
"count": 24,
|
||||
"scope": "Production clone state/motion and texture initialization; no continuous Vision registration or host UI",
|
||||
"runner": "python3 tools/tracking/verify_clone_repair.py --output verification/CloneRepairState-20261114.json"
|
||||
},
|
||||
"sourceCompilation": [
|
||||
{
|
||||
"file": "DYPlugIn.mm",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYInspector.mm",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYColorWorkspace.mm",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYDiagnostics.mm",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYPlugIn.mm",
|
||||
"phase": "final source syntax after added host tests",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYDiagnostics.mm",
|
||||
"phase": "final source syntax after added host tests",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYPlugIn.mm",
|
||||
"phase": "final status wording and workspace cleanup",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"file": "DYColorWorkspace.mm",
|
||||
"phase": "final status wording and workspace cleanup",
|
||||
"exitCode": 0,
|
||||
"errors": []
|
||||
}
|
||||
],
|
||||
"addedNativeHostChecks": {
|
||||
"count": 9,
|
||||
"names": [
|
||||
"clone-last-trusted-button-maps-input-time-to-host-timeline",
|
||||
"linked-clone-tracks-with-completely-flat-clean-source",
|
||||
"flat-small-repair-can-follow-separate-surface-reference",
|
||||
"clone-first-frame-failure-persists-canvas-reason-without-keys",
|
||||
"clone-bidirectional-first-loss-is-not-labelled-forward-complete",
|
||||
"clone-manual-key-command-starts-after-zero-frame-failure",
|
||||
"clone-manual-source-drag-keys-current-frame-without-moving-earlier-source",
|
||||
"clone-manual-target-correction-preserves-source-key-at-same-frame",
|
||||
"clone-reference-draw-gesture-preserves-repair-and-manual-keys"
|
||||
],
|
||||
"executed": false,
|
||||
"reason": "Requires completed formal Release build, working GPU/Vision and installed-product self-test."
|
||||
},
|
||||
"fullXcodeBuild": {
|
||||
"exitCode": 65,
|
||||
"configuration": "Release",
|
||||
"purpose": "Compilation validation only; signing disabled, no installation or launch. Task-owned /tmp build directory will be removed.",
|
||||
"blockingError": "cannot execute tool 'metal' due to missing Metal Toolchain",
|
||||
"note": "An existing Metal toolchain executable from the prior build log is readable and reports its version, but current Xcode discovery did not use it. Do not diagnose this as a newly proven missing installation. Existing CMS build scripts also use protected cache locations; no product build scripts or system toolchain configuration were changed."
|
||||
},
|
||||
"formalDeliveryGate": {
|
||||
"lockAvailable": false,
|
||||
"error": "[Errno 1] Operation not permitted: '/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock'"
|
||||
},
|
||||
"gitCheckpoint": {
|
||||
"staged": false,
|
||||
"committed": false,
|
||||
"pushed": false,
|
||||
"lockAvailable": false,
|
||||
"lockError": "[Errno 1] Operation not permitted: '/Users/mac/.codex/git-backup-locks/d22eb11b96e9de5ccebe32e2af005ad1b92aedffed8b5fef62656f50cc90aa7a.lock'",
|
||||
"remoteReadbackExitCode": 128,
|
||||
"remoteReadbackError": "fatal: unable to access 'https://dayu.media/git/dayu/dayu-color.git/': Could not resolve host: dayu.media"
|
||||
},
|
||||
"acceptance": {
|
||||
"formalInstallSelfTest": false,
|
||||
"FCP": false,
|
||||
"Motion": false,
|
||||
"userFootage": false,
|
||||
"newPackage": false,
|
||||
"releaseUpload": false,
|
||||
"articleUpdate": false,
|
||||
"appUpdateChannelChanged": false
|
||||
},
|
||||
"publicationDraft": "Packaging/release-notes-clone-repair-pending.md",
|
||||
"knownLimits": [
|
||||
"Clone rendering still applies its existing position and axis scales; full projective/rotational patch rendering is outside this change.",
|
||||
"Reference selection requires a suitable texture on the same moving surface; unsupported motion is stopped rather than invented.",
|
||||
"Canvas layout, host error lifecycle, undo, cold reopen and actual motion still require formal installed FCP acceptance.",
|
||||
"Previous audit Vision registration failed with com.apple.Vision code 8 / Failed to create CVPixelBuffer in this session; this turn does not claim new continuous-registration coverage."
|
||||
],
|
||||
"nextStep": "Restore a session that permits the existing Git/delivery locks, build cache, signing/notarization, formal installation and network. Review the source diff, commit/push under the repository lock, assign an unused next version, build via tools/deliver.py, run formal native+FCP acceptance, then package/release and update article 15792 against its latest live baseline.",
|
||||
"temporaryCompiledProductsRemoved": [
|
||||
"/tmp/dayu-color-clone-build",
|
||||
"/tmp/dayu-clone-fix-baseline-y58llts5",
|
||||
"/tmp/dayu-clone-repair-test"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
{
|
||||
"checkedAt": "2026-11-14T22:42:17.257325+08:00",
|
||||
"scope": "Compile unchanged production shader inputs using the existing installed Metal binaries selected explicitly for this diagnostic only. No APP build, signing, installation, host acceptance or publication.",
|
||||
"pass": true,
|
||||
"toolchain": "/var/run/com.apple.security.cryptexd/mnt/com.apple.MobileAsset.MetalToolchain-v27.1.266.1.T1KMQ5/Metal.xctoolchain",
|
||||
"earlierAttempt": {
|
||||
"pass": false,
|
||||
"commands": [
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal",
|
||||
"exitCode": 1,
|
||||
"diagnostics": "error: unable to open output file '/Users/mac/.cache/clang/ModuleCache/1XHQ4VUOULIN0/metal_types-3D8SHXEB7CY9P.pcm': 'Operation not permitted'\n<built-in>:1:10: fatal error: could not build module 'metal_types'\n#include \"metal_types\"\n ~~~~~~~~^~~~~~~~~~~~~\nerror: unable to open output file '/Users/mac/.cache/clang/ModuleCache/1XHQ4VUOULIN0/metal_stdlib-3D8SHXEB7CY9P.pcm': 'Operation not permitted'\nerror: unable to open output file '/Users/mac/.cache/clang/ModuleCache/1XHQ4VUOULIN0/simd_simd_h-3D8SHXEB7CY9P.pcm': 'Operation not permitted'\n4 errors generated.\n"
|
||||
}
|
||||
],
|
||||
"error": "Command '['/var/run/com.apple.security.cryptexd/mnt/com.apple.MobileAsset.MetalToolchain-v27.1.266.1.T1KMQ5/Metal.xctoolchain/usr/bin/metal', '-std=metal3.1', '-mmacosx-version-min=14.6', '-c', '/Volumes/备份/大鱼调色/大鱼调色/大鱼调色/Plugin/DYGrade.metal', '-o', '/private/var/folders/7k/rzlzc30s5r3641f3qhbrw5xw0000gn/T/dayu-clone-release-kernels-undsxcku/intermediates/DYGradeWrapper.air']' returned non-zero exit status 1."
|
||||
},
|
||||
"commands": [
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal-opt",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metal",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
},
|
||||
{
|
||||
"tool": "metallib",
|
||||
"exitCode": 0,
|
||||
"diagnostics": ""
|
||||
}
|
||||
],
|
||||
"bytes": 961236,
|
||||
"sha256": "5acc6fc7abda835021b38455dcd4ee582691d31869ed2cf844a1ca0e933dc8cc",
|
||||
"explicitDiagnosticSelection": {
|
||||
"tools": "Existing Metal toolchain binaries",
|
||||
"moduleCache": "Task-owned temporary directory via -fmodules-cache-path; no system or project configuration modified"
|
||||
},
|
||||
"temporaryProductsRemovedOnExit": true
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
{
|
||||
"pass": true,
|
||||
"scope": "Production clone state/motion and texture initialization; no continuous Vision registration or host UI",
|
||||
"results": [
|
||||
{
|
||||
"name": "legacy-stamp-keeps-independent-tracking",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "linked-stamp-mode-survives-property-list-roundtrip",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "invalid-tracking-mode-rejected",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "reference-selection-accepts-nearby-surface-texture",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "reference-does-not-enlarge-or-move-repair",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "reference-restores-selected-rectangle",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "tiny-blemish-can-use-large-distant-reference-on-same-surface",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "invalid-reference-does-not-overwrite-existing-reference",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "reference-and-mode-persist-on-cold-read",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "linked-clean-source-follows-reference-translation",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "separate-reference-transfers-anisotropic-scale",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "offset-centre-uses-image-aspect-during-rotation",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "linked-source-leaving-frame-is-explicit-loss",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "invalid-reference-result-is-never-used",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "invalid-image-aspect-is-never-used",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "manual-key-can-be-created-before-any-automatic-track",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "manual-end-key-retains-original-sampling-origin",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "manual-repair-and-source-interpolate-between-frames",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "reference-follows-manually-corrected-repair",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "manual-key-at-existing-time-does-not-duplicate-time",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "automatic-retracking-preserves-manually-authored-source-position",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "failed-status-and-exact-last-frame-persist-without-new-tracks",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "invalid-return-frame-time-rejected",
|
||||
"pass": true
|
||||
},
|
||||
{
|
||||
"name": "flat-reference-remains-explicit-insufficient-texture",
|
||||
"pass": true
|
||||
}
|
||||
],
|
||||
"compileExitCode": 0,
|
||||
"testExitCode": 0,
|
||||
"hostAcceptance": false
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
{
|
||||
"auditedAt": "2026-11-14T16:23:56.784740+08:00",
|
||||
"scope": "Current clone-stamp implementation and guidance audit; no product code, binary, installation or release changes; no user footage/host UI reproduction.",
|
||||
"workspaceCommit": "5a10408557cf4bb7dd96477ecc72829f48242a07",
|
||||
"installedVersion": "1.22.1",
|
||||
"installedBuild": 133,
|
||||
"releaseBuildSource": "7f833757da243f2a4610c23c36ec278b44c80ad4",
|
||||
"auditedSourcesEqualReleaseBuildSource": true,
|
||||
"sourceSHA256": {
|
||||
"大鱼调色/Plugin/DYToolHostMethods.inc.h": "2d1c459c3b05341391e8659620d47a0d81f8f30839237f526a784d0f2f6dc8c1",
|
||||
"大鱼调色/Plugin/DYToolHostIvars.inc.h": "2ad1490d8eb35c2fc97bca635363af4148b81a1dc9f6b7ae27003a1862688d2f",
|
||||
"大鱼调色/Plugin/MaskCore/DYVisionRegionTracker.hpp": "a5a429cc69169e1c4a182e84051bba5a1d4c3736188bd51fed3cb18dcfd5f6f3",
|
||||
"大鱼调色/Plugin/DYToolOSC.inc.h": "94187eb5ce03fa9a8613b46744ca23e5ef76712112a81ecc4d768fd9fcfc1fdc",
|
||||
"大鱼调色/Plugin/DYToolState.mm": "c36d2e91353f2b179be5a9df8c248ce34dbfb7e73cba913754f9d1675f2a3375",
|
||||
"大鱼调色/Plugin/DYToolCanvasEditing.inc.h": "8ac846d635ac9460821a9a8142944a09f2b536e745197c30f50e5cdc5aed161e",
|
||||
"大鱼调色/Plugin/DYMaskPanel.inc.h": "ec69e5777d2e87ed2eb58a401b24d9edf5e574d066470a96e5aacd8f97079a65",
|
||||
"大鱼调色/Plugin/DYTrackingPreview.inc.h": "6e54b64787a5d3b7f1d14f6517cfc67260ea335a7ca174b40ae9d3d8c81d9924",
|
||||
"大鱼调色/Plugin/DYGrade.metal": "46618360efdceaf1a9819147cc0b96358babc887fdc36a632e8e5bb70f2d6d0e"
|
||||
},
|
||||
"findings": [
|
||||
"DYToolHostIvars uses two VisionRegionTracker instances for target and source. Mosaic uses a separate object tracker; stamp has no object-recovery fallback.",
|
||||
"Vision homographic registration estimates local motion. Confidence uses grayscale sample correlation inside the actual polygon. Initial per-sample variance must be at least 0.0004; tracking correlation must be at least 0.65 and valid sample count at least 60 percent.",
|
||||
"Both target and source reset must succeed; either tracker loss stops the pair. Rendered stamp consumes center and X/Y scales; stamp angle is zero, with no full homography applied to patch rendering.",
|
||||
"GPU copies original pixels from the current frame with ellipse feather and strength; no content synthesis, inpainting, frozen reference frame or automatic brightness match.",
|
||||
"Creation canvas has two-step hints. Saved stamp canvas controls display tracking direction/stop; toolCanvasMaskAtTime carries no failure reason to drawStampControls.",
|
||||
"Failure strings are sent to workspace/panel status. A durable mask status is written only when trajectory keys changed and the candidate is saved; initial texture failure has no durable status. Early completion/UI-open timing is a possible visibility gap, not reproduced in FCP this round.",
|
||||
"maskKeySpan clamps geometry and source motion at trajectory endpoints. Continuing playback after a partial track holds the endpoint, which can look like a frozen patch.",
|
||||
"Continuous tracking leaves timeline playhead at the seed; only successful single-frame mode seeks. Existing instruction to continue from here does not navigate to the failure/last confirmed time.",
|
||||
"No separate tracking ROI, linked source mode, automatic nearby reference selection or first-time manual-keyframe authoring UI. Canvas geometry edits create manual keys only if keys already exist."
|
||||
],
|
||||
"flatSeedProbe": {
|
||||
"pass": true,
|
||||
"cases": [
|
||||
{
|
||||
"flatSource": true,
|
||||
"sourceFailure": 2,
|
||||
"sourceSeeded": false,
|
||||
"mode": 0,
|
||||
"flatTarget": true,
|
||||
"targetFailure": 2,
|
||||
"pairCanStart": false,
|
||||
"pass": true,
|
||||
"targetSeeded": false
|
||||
},
|
||||
{
|
||||
"flatSource": false,
|
||||
"sourceFailure": 0,
|
||||
"sourceSeeded": true,
|
||||
"mode": 1,
|
||||
"flatTarget": true,
|
||||
"targetFailure": 2,
|
||||
"pairCanStart": false,
|
||||
"pass": true,
|
||||
"targetSeeded": false
|
||||
},
|
||||
{
|
||||
"flatSource": true,
|
||||
"sourceFailure": 2,
|
||||
"sourceSeeded": false,
|
||||
"mode": 2,
|
||||
"flatTarget": false,
|
||||
"targetFailure": 0,
|
||||
"pairCanStart": false,
|
||||
"pass": true,
|
||||
"targetSeeded": true
|
||||
},
|
||||
{
|
||||
"flatSource": false,
|
||||
"sourceFailure": 0,
|
||||
"sourceSeeded": true,
|
||||
"mode": 3,
|
||||
"flatTarget": false,
|
||||
"targetFailure": 0,
|
||||
"pairCanStart": true,
|
||||
"pass": true,
|
||||
"targetSeeded": true
|
||||
}
|
||||
]
|
||||
},
|
||||
"flatSeedProbeScope": "Four synthetic 320x192 frames, source left and target right, .32x.54 elliptical ROI. Tests reset only, matching current pair initialization. Source/target flat halves set to 0.5; textured halves use existing verify_vision_regions fixture. Not a user-footage or host timing test.",
|
||||
"existingVisionSuite": {
|
||||
"pass": false,
|
||||
"milliseconds": 60.46325,
|
||||
"results": [
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0,
|
||||
"confidence": 1,
|
||||
"cy": 0.5,
|
||||
"sx": 1,
|
||||
"valid": false,
|
||||
"i": 1,
|
||||
"failure": 3,
|
||||
"sy": 1,
|
||||
"cx": 0.5
|
||||
}
|
||||
],
|
||||
"flatLossPass": false,
|
||||
"mode": 0,
|
||||
"geometryPass": false
|
||||
},
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0,
|
||||
"confidence": 1,
|
||||
"cy": 0.5,
|
||||
"sx": 1,
|
||||
"valid": false,
|
||||
"i": 1,
|
||||
"failure": 3,
|
||||
"sy": 1,
|
||||
"cx": 0.5
|
||||
}
|
||||
],
|
||||
"flatLossPass": false,
|
||||
"mode": 1,
|
||||
"geometryPass": false
|
||||
},
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0,
|
||||
"confidence": 1,
|
||||
"cy": 0.5,
|
||||
"sx": 1,
|
||||
"valid": false,
|
||||
"i": 1,
|
||||
"failure": 3,
|
||||
"sy": 1,
|
||||
"cx": 0.25
|
||||
}
|
||||
],
|
||||
"flatLossPass": false,
|
||||
"mode": 2,
|
||||
"geometryPass": false
|
||||
},
|
||||
{
|
||||
"steps": [
|
||||
{
|
||||
"angle": 0,
|
||||
"confidence": 1,
|
||||
"cy": 0.5,
|
||||
"sx": 1,
|
||||
"valid": false,
|
||||
"i": 1,
|
||||
"failure": 3,
|
||||
"sy": 1,
|
||||
"cx": 0.75
|
||||
}
|
||||
],
|
||||
"flatLossPass": false,
|
||||
"mode": 3,
|
||||
"geometryPass": false
|
||||
}
|
||||
]
|
||||
},
|
||||
"existingVisionSuiteStatus": "NOT PASSED in this execution environment. All four modes seed but stop at first registration with TrackFailure::Backend. Diagnostic copy prints com.apple.Vision code=8 Failed to create CVPixelBuffer; not evidence of a regression in the unchanged installed product.",
|
||||
"visionBackendDiagnostic": "sysctlbyname for kern.hv_vmm_present failed with status -1Vision NSError domain=com.apple.Vision code=8 description=Failed to create CVPixelBuffer\n",
|
||||
"recommendedFollowup": [
|
||||
"Persistent canvas explanation: which region, stopped time and last confirmed time, saved result, and a concrete next step; clear running/stopped state and texture warning before analysis.",
|
||||
"Decouple repair ellipse and tracking reference ROI on the same moving surface; keep a small clean patch while tracking larger suitable detail.",
|
||||
"Add linked-source motion and explicit independent-source option; image-fixed defects can use a fixed untracked stamp.",
|
||||
"Add first-time manual keyframes and a last-confirmed-frame navigation action. No claim these options already exist."
|
||||
],
|
||||
"remoteReadback": "git ls-remote origin main failed: Could not resolve host: dayu.media",
|
||||
"delivery": "Investigation only; plugin remains 1.22.1 (133).",
|
||||
"gitCheckpoint": {
|
||||
"committed": false,
|
||||
"pushed": false,
|
||||
"reason": "Repository backup lock creation under /Users/mac/.codex/git-backup-locks was denied (Operation not permitted) in this session. No git add/commit/push mutation ran. Remote readback separately failed DNS resolution for dayu.media."
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
{
|
||||
"date": "2026-11-14",
|
||||
"timezone": "Asia/Shanghai",
|
||||
"goal": "Diagnose and repair the current execution restrictions preventing the already-authorized release.",
|
||||
"status": "execution-path-confirmed-policy-not-repaired",
|
||||
"application": {
|
||||
"bundlePath": "/Applications/ChatGPT.app",
|
||||
"bundleID": "com.openai.codex",
|
||||
"version": "26.1111.21308",
|
||||
"build": "27194"
|
||||
},
|
||||
"confirmedFacts": {
|
||||
"userConfigSandboxMode": "danger-full-access",
|
||||
"userConfigApprovalPolicy": "never",
|
||||
"projectTrust": "trusted",
|
||||
"currentExecutionPath": "Local Work executor launched with exec-server --remote and CODEX_INTERNAL_ORIGINATOR_OVERRIDE=codex_work_desktop",
|
||||
"effectiveSessionPolicy": "workspace-write, Git metadata read-only, network restricted, sandbox approval unavailable",
|
||||
"processNetworkDisabledEnvironment": "CODEX_SANDBOX_NETWORK_DISABLED=1",
|
||||
"psExecutionDenied": true,
|
||||
"gitAndDeliveryLockMkdirDenied": true,
|
||||
"remoteReadbackBlockedByDNSFailure": true,
|
||||
"ordinaryConfigIsNotProofOfWorkStepPermissions": true
|
||||
},
|
||||
"absentConfigFiles": [
|
||||
"/etc/codex/requirements.toml",
|
||||
"/etc/codex/managed_config.toml",
|
||||
"/Users/mac/.codex/requirements.toml",
|
||||
"/Volumes/备份/大鱼调色/.codex/config.toml",
|
||||
"/Volumes/备份/大鱼调色/大鱼调色/.codex/config.toml"
|
||||
],
|
||||
"logEvidence": {
|
||||
"path": "/Users/mac/Library/Logs/com.openai.codex/2026/11/14/codex-desktop-f609ee76-ffcf-406f-8213-15696e4e3dbb-69492-t0-i1-142344-0.log",
|
||||
"executorStarted": "2026-11-14T14:23:53.222Z",
|
||||
"transientStartupFailure": {
|
||||
"attempt": 3,
|
||||
"time": "2026-11-14T14:23:53.279Z",
|
||||
"code": "ENOENT",
|
||||
"operation": "Copying the existing codex-app-tools executor plugin",
|
||||
"recovered": true,
|
||||
"notEstablishedAsCauseOfPersistentPermissions": true
|
||||
},
|
||||
"executorConnected": {
|
||||
"attempt": 4,
|
||||
"time": "2026-11-14T14:24:03.898Z",
|
||||
"outcome": "recovered"
|
||||
},
|
||||
"applicationToolPipeFailure": {
|
||||
"time": "2026-11-14T14:35:38.807Z",
|
||||
"message": "The app tool call ended before producing a result"
|
||||
}
|
||||
},
|
||||
"selfApplicationUI": {
|
||||
"attempted": "Read the ChatGPT app UI to inspect its execution mode",
|
||||
"allowed": false,
|
||||
"error": "Computer Use is not allowed to use the app 'com.openai.codex' for safety reasons.",
|
||||
"changed": false
|
||||
},
|
||||
"officialReferences": [
|
||||
{
|
||||
"url": "https://learn.chatgpt.com/docs/config-file/config-reference",
|
||||
"section": "Settings for Local computer access with Work Cloud",
|
||||
"relevance": "Ordinary local defaults are not necessarily consumed by cloud coordination; orchestrator and local execution policy scopes differ."
|
||||
},
|
||||
{
|
||||
"url": "https://learn.chatgpt.com/docs/environments/modes",
|
||||
"section": "Codex environments",
|
||||
"relevance": "The ChatGPT dropdown offers Codex; Local/This computer runs in the current project directory."
|
||||
}
|
||||
],
|
||||
"diagnosisLimits": [
|
||||
"The effective restricted execution policy directly explains lock, Git and command-network failures.",
|
||||
"No complete policy assignment provenance was obtained; no specific enterprise rule or application regression has been proven.",
|
||||
"The saved full-access setting cannot be assumed to control this cloud-coordinated Work turn.",
|
||||
"No app binary, authentication, security policy, operating system setting or project product code was modified."
|
||||
],
|
||||
"nextSupportedStep": "User selects Codex from the ChatGPT dropdown, chooses Local/This computer and the existing project. Verify actual permissions and network in that execution session before resuming release. This is a supported environment selection, not a verified guarantee that creating a new session resolves every restriction.",
|
||||
"releaseState": {
|
||||
"installedVersion": "1.22.1",
|
||||
"installedBuild": "133",
|
||||
"newPackageCreated": false,
|
||||
"liveArticleUpdated": false,
|
||||
"gitCommitted": false,
|
||||
"gitPushed": false
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
{
|
||||
"checkedAt": "2026-11-14T22:26:29.858402+08:00",
|
||||
"requestedWork": "制作新的安装包、更新文章和推送仓库",
|
||||
"status": "blocked-before-formal-build-and-publication",
|
||||
"authorization": "User has authorized the package, article and repository publication; no additional permission is required within this scope.",
|
||||
"executionConfigurationMismatch": {
|
||||
"userReportsFullAccessAlreadyEnabled": true,
|
||||
"localConfigPath": "/Users/mac/.codex/config.toml",
|
||||
"localConfigSandboxMode": "danger-full-access",
|
||||
"localConfigApprovalPolicy": "never",
|
||||
"localProjectTrustLevel": "trusted",
|
||||
"observedProcessEnvironment": {
|
||||
"CODEX_SANDBOX_NETWORK_DISABLED": "1"
|
||||
},
|
||||
"effectiveSessionPolicy": "workspace-write with Git metadata read-only and sandbox escalation unavailable",
|
||||
"sessionStatusReadback": "codex_app/read_thread failed with an app tool request error",
|
||||
"rootCause": "Not established. Stored configuration and effective session restrictions differ; mode routing, configuration override and application permission propagation have not been distinguished.",
|
||||
"furtherUserAuthorizationNeeded": false
|
||||
},
|
||||
"repository": {
|
||||
"root": "/Volumes/备份/大鱼调色/大鱼调色",
|
||||
"remote": "https://dayu.media/git/dayu/dayu-color.git",
|
||||
"branch": "main",
|
||||
"localHEAD": "5a10408557cf4bb7dd96477ecc72829f48242a07",
|
||||
"existingUnrelatedChangePreserved": "大鱼调色.xcodeproj/project.pbxproj Security.framework reference ordering",
|
||||
"gitMetadataAccess": "read-only under current session permission profile"
|
||||
},
|
||||
"installedProduct": {
|
||||
"path": "/Library/Plug-Ins/FxPlug/大鱼调色.app",
|
||||
"version": "1.22.1",
|
||||
"build": "133",
|
||||
"verification": "Read CFBundleShortVersionString and CFBundleVersion with plutil; not a new host acceptance test."
|
||||
},
|
||||
"sourceComparison": {
|
||||
"reference": "verification/CloneRepairFix-20261114.json",
|
||||
"field": "sourceSHA256",
|
||||
"files": 16,
|
||||
"allUnchanged": true,
|
||||
"priorIsolatedChecks": 24,
|
||||
"rerun": false,
|
||||
"addedFormalNativeChecksExecuted": false,
|
||||
"FCPAcceptanceCompleted": false
|
||||
},
|
||||
"preflight": [
|
||||
{
|
||||
"name": "delivery-lock",
|
||||
"operation": "Atomic mkdir followed by removal only if created",
|
||||
"path": "/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock",
|
||||
"pass": false,
|
||||
"errno": 1,
|
||||
"error": "Operation not permitted",
|
||||
"lockCreated": false
|
||||
},
|
||||
{
|
||||
"name": "repository-lock",
|
||||
"operation": "Atomic mkdir followed by removal only if created",
|
||||
"path": "/Users/mac/.codex/git-backup-locks/d22eb11b96e9de5ccebe32e2af005ad1b92aedffed8b5fef62656f50cc90aa7a.lock",
|
||||
"pass": false,
|
||||
"errno": 1,
|
||||
"error": "Operation not permitted",
|
||||
"lockCreated": false
|
||||
},
|
||||
{
|
||||
"name": "repository-authentication",
|
||||
"command": "/Users/mac/.local/bin/dayu-git auth status",
|
||||
"pass": false,
|
||||
"error": "Keychain access failed (status -50).",
|
||||
"serverAuthorizationEvaluated": false
|
||||
},
|
||||
{
|
||||
"name": "remote-main-readback",
|
||||
"command": "git ls-remote origin refs/heads/main",
|
||||
"pass": false,
|
||||
"exitCode": 128,
|
||||
"error": "Could not resolve host: dayu.media",
|
||||
"remoteSHA": null
|
||||
},
|
||||
{
|
||||
"name": "metal-toolchain-discovery",
|
||||
"command": "xcrun metal --version",
|
||||
"pass": false,
|
||||
"exitCode": 1,
|
||||
"wrapperLocated": "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/metal",
|
||||
"error": "cannot execute tool 'metal' due to missing Metal Toolchain",
|
||||
"scope": "Current session discovery failed. This does not prove the underlying toolchain is absent; see prior build diagnostics."
|
||||
}
|
||||
],
|
||||
"delivery": {
|
||||
"newVersionAssigned": false,
|
||||
"newCompiledSourceCommit": null,
|
||||
"newReleaseTag": null,
|
||||
"newAppBuilt": false,
|
||||
"newAppSignedNotarizedInstalled": false,
|
||||
"newPackageCreated": false,
|
||||
"releaseUploaded": false,
|
||||
"article15792Updated": false,
|
||||
"appUpdateChannelChanged": false,
|
||||
"gitStaged": false,
|
||||
"gitCommitted": false,
|
||||
"gitPushed": false,
|
||||
"remoteVerified": false
|
||||
},
|
||||
"localDocumentation": [
|
||||
"开发交接.md",
|
||||
"verification/ReleasePreparation-20261114.json"
|
||||
],
|
||||
"publicationDraft": "Packaging/release-notes-clone-repair-pending.md",
|
||||
"nextStep": "Resume in a local session with the existing locks, build cache, Keychain, formal installation path and network available. Review and commit/push the pending fix excluding unrelated project sorting, read back the remote, assign an unused version, deliver and accept the installed Release, package and verify Release downloads, then update article 15792 against its current live baseline.",
|
||||
"followupWork": {
|
||||
"recordedAt": "2026-11-14T22:43:59.269494+08:00",
|
||||
"userInstruction": "继续完成",
|
||||
"repeatedPreflight": "Network disabled, both lock mkdir operations still denied with errno 1, remote main readback still fails DNS.",
|
||||
"articleTemplate": {
|
||||
"path": "Packaging/article-clone-repair-pending.json",
|
||||
"state": "prepared-not-publishable",
|
||||
"bodyBlocks": 8,
|
||||
"structureChecked": true,
|
||||
"liveArticleUpdated": false
|
||||
},
|
||||
"shaderBuild": {
|
||||
"path": "verification/CloneRepairShaderBuild-20261114.json",
|
||||
"pass": true,
|
||||
"successfulSteps": 8,
|
||||
"bytes": 961236,
|
||||
"sha256": "5acc6fc7abda835021b38455dcd4ee582691d31869ed2cf844a1ca0e933dc8cc",
|
||||
"scope": "Compile unchanged production shader inputs using the existing installed Metal binaries selected explicitly for this diagnostic only. No APP build, signing, installation, host acceptance or publication.",
|
||||
"temporaryProductsRemoved": true
|
||||
},
|
||||
"sourceUnchanged": true,
|
||||
"newProductCodeChanges": false,
|
||||
"fullReleaseCompleted": false,
|
||||
"gitCommitted": false,
|
||||
"gitPushed": false
|
||||
}
|
||||
}
|
||||
@@ -201,8 +201,7 @@ static BOOL DYWorkspaceEnabled(DYUniforms u,NSString *type){if([type isEqual:@"b
|
||||
- (void)trackingPreviewChanged:(NSNotification *)note {
|
||||
NSDictionary *info=note.userInfo;
|
||||
if(!info[@"tracking"]||(!_visible&&!_opening))return;
|
||||
BOOL active=[info[@"tracking"] boolValue];
|
||||
if(active&&_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
|
||||
if(_trackingPreview.hidden)[self setTrackingPreviewVisible:YES];
|
||||
if(!_trackingPreview.hidden)[_trackingPreview applyUpdate:info];
|
||||
}
|
||||
- (void)trackingPreviewAction:(id)sender {
|
||||
|
||||
+38
-11
@@ -11,6 +11,7 @@
|
||||
@end
|
||||
@implementation DYToolMaskPanel {
|
||||
id<PROAPIAccessing> _host;NSString *_nodeID,*_maskID;NSDictionary *_document;CMTime _time;
|
||||
NSPopUpButton *_stampMode;NSButton *_reference,*_referenceReset,*_manualKey,*_lastTrusted;NSTextField *_stampGuide;BOOL _trackingBusy;
|
||||
NSPopUpButton *_list,*_combine;NSButton *_eye,*_add,*_remove,*_invert,*_canvas,*_clear,*_penRedraw,*_penFinish,*_penCancel;NSMutableArray *_rows,*_tracking;NSTextField *_trackingTitle,*_status;BOOL _refreshing,_drawing,_canvasActive,_workspaceMode;CGFloat _contentHeight;
|
||||
}
|
||||
@synthesize workspaceMode=_workspaceMode;
|
||||
@@ -18,11 +19,11 @@
|
||||
- (void)setWorkspaceMode:(BOOL)workspaceMode{if(_workspaceMode==workspaceMode)return;_workspaceMode=workspaceMode;[self setNeedsLayout:YES];}
|
||||
- (CGFloat)contentHeight{return _workspaceMode?self.bounds.size.height:_contentHeight;}
|
||||
- (CGFloat)contentWidth{
|
||||
if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actions=216;if(pen&&shape&&self.bounds.size.height<242)actions+=216;return MAX(536,16+ceil(double(count)/perColumn)*184+actions);
|
||||
if(!_workspaceMode)return self.bounds.size.width;NSUInteger count=0;for(NSDictionary *row in _rows)if(![row[@"label"]isHidden])count++;NSInteger perColumn=MAX(1,NSInteger((self.bounds.size.height-48)/44));BOOL pen=!_penRedraw.hidden,shape=_tracking.count&&![_tracking[0]isHidden];CGFloat actions=shape&&self.bounds.size.height<240?432:216;if(_stampMode&&!_stampMode.hidden)actions+=240;if(pen&&shape&&self.bounds.size.height<242)actions+=216;return MAX(536,16+ceil(double(count)/perColumn)*184+actions);
|
||||
}
|
||||
- (void)selectMaskID:(NSString*)maskID{
|
||||
if([_maskID isEqual:maskID]){if(!_canvasActive)[self canvas:nil];return;}BOOL found=NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID]){found=YES;break;}if(!found)return;
|
||||
[_maskID release];_maskID=[maskID copy];_drawing=_canvasActive=NO;[self refreshWithDocument:_document time:_time];[self canvas:nil];
|
||||
[_maskID release];_maskID=[maskID copy];_drawing=_canvasActive=_trackingBusy=NO;[self refreshWithDocument:_document time:_time];[self canvas:nil];
|
||||
}
|
||||
- (instancetype)initWithManager:(id<PROAPIAccessing>)manager nodeID:(NSString*)nodeID{
|
||||
if((self=[super initWithFrame:NSZeroRect])){_host=manager;_nodeID=[nodeID copy];_rows=[NSMutableArray new];_tracking=[NSMutableArray new];self.identifier=@"toolMasks";
|
||||
@@ -49,15 +50,26 @@
|
||||
for(int i=0;i<6;i++){NSButton *b=DYButton(titles[i],self,@selector(track:));b.tag=((int[]){-2,-1,0,1,2,9})[i];b.font=[NSFont systemFontOfSize:13 weight:NSFontWeightMedium];b.controlSize=NSControlSizeRegular;b.accessibilityLabel=@[@"反向跟踪一帧",@"反向蒙版跟踪",@"双向蒙版跟踪",@"正向蒙版跟踪",@"正向跟踪一帧",@"取消蒙版跟踪"][i];[self addSubview:b];[_tracking addObject:b];}
|
||||
for(NSButton *b in @[_eye,_add,_remove,_canvas,_clear,_penRedraw,_penFinish,_penCancel]){b.controlSize=NSControlSizeRegular;b.font=[NSFont systemFontOfSize:(b==_add||b==_remove)?18:13 weight:NSFontWeightMedium];}
|
||||
_trackingTitle=[DYLabel(@"运动跟踪",13)retain];_trackingTitle.font=[NSFont systemFontOfSize:13 weight:NSFontWeightSemibold];[self addSubview:_trackingTitle];
|
||||
_stampMode=[[NSPopUpButton alloc]initWithFrame:NSZeroRect pullsDown:NO];[_stampMode addItemsWithTitles:@[@"取样跟随修复区移动",@"取样区独立跟踪"]];_stampMode.target=self;_stampMode.action=@selector(stampModeChanged:);_stampMode.accessibilityLabel=@"图章取样跟踪方式";_stampMode.toolTip=@"同一表面上的纯色取样区请选择跟随模式;取样区和修复区分别运动时才使用独立跟踪。";[self addSubview:_stampMode];
|
||||
_reference=[DYButton(@"选择跟踪参考",self,@selector(stampCommand:))retain];_reference.identifier=@"reference";_reference.toolTip=@"在画面拖框选择同一表面的纹理,绿色参考框不会扩大黄色修复范围。";
|
||||
_referenceReset=[DYButton(@"重置参考",self,@selector(stampCommand:))retain];_referenceReset.identifier=@"clearReference";
|
||||
_manualKey=[DYButton(@"手工关键帧",self,@selector(stampCommand:))retain];_manualKey.identifier=@"manual";_manualKey.toolTip=@"先保存当前帧,再移到其它帧拖动修复区/取样点,帧间自动过渡。";
|
||||
_lastTrusted=[DYButton(@"最后可信帧",self,@selector(stampCommand:))retain];_lastTrusted.identifier=@"return";
|
||||
for(NSButton *button in @[_reference,_referenceReset,_manualKey,_lastTrusted]){button.font=[NSFont systemFontOfSize:11];[self addSubview:button];}
|
||||
_stampGuide=[DYLabel(@"",11)retain];_stampGuide.maximumNumberOfLines=4;_stampGuide.lineBreakMode=NSLineBreakByWordWrapping;[self addSubview:_stampGuide];
|
||||
_status=[DYLabel(@"",12)retain];_status.maximumNumberOfLines=3;_status.lineBreakMode=NSLineBreakByWordWrapping;[self addSubview:_status];_contentHeight=0;
|
||||
}
|
||||
- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[_maskID release];[_document release];[_list release];[_combine release];[_eye release];[_add release];[_remove release];[_invert release];[_canvas release];[_clear release];[_penRedraw release];[_penFinish release];[_penCancel release];[_rows release];[_tracking release];[_trackingTitle release];[_status release];[super dealloc];}
|
||||
- (void)dealloc{[NSNotificationCenter.defaultCenter removeObserver:self];[_nodeID release];[_maskID release];[_document release];[_list release];[_combine release];[_eye release];[_add release];[_remove release];[_invert release];[_canvas release];[_clear release];[_penRedraw release];[_penFinish release];[_penCancel release];[_rows release];[_tracking release];[_trackingTitle release];[_status release];[_stampMode release];[_reference release];[_referenceReset release];[_manualKey release];[_lastTrusted release];[_stampGuide release];[super dealloc];}
|
||||
- (NSDictionary*)mask{for(NSDictionary *m in DYMasksForTool(_document,_nodeID))if([m[@"id"]isEqual:_maskID])return m;return nil;}
|
||||
- (void)refreshWithDocument:(NSDictionary*)doc time:(CMTime)time{
|
||||
_refreshing=YES;NSDictionary *saved=[doc copy];[_document release];_document=saved;_time=time;NSArray *masks=DYMasksForTool(doc,_nodeID);if(masks.count)[self buildControls];[_list removeAllItems];NSInteger selected=0,index=0;
|
||||
for(NSDictionary *m in masks){DYMaskParameters p=DYMaskAtTime(m,time);[_list addItemWithTitle:m[@"label"]?:[NSString stringWithFormat:@"%@ %ld",m[@"stampSource"]?@"仿制图章":@[@"椭圆",@"矩形",@"钢笔",@"线性渐变",@"HSL 选区",@"亮度选区"][p.kind],(long)index+1]];if([m[@"id"]isEqual:_maskID])selected=index;index++;}
|
||||
if(!masks.count){_contentHeight=0;_drawing=_canvasActive=NO;[_maskID release];_maskID=nil;_refreshing=NO;return;}[_list selectItemAtIndex:selected];if(![_maskID isEqual:masks[selected][@"id"]])_drawing=_canvasActive=NO;[_maskID release];_maskID=[masks[selected][@"id"]copy];NSDictionary *m=[self mask];DYMaskParameters p=DYMaskAtTime(m,time);if(p.kind!=DYMaskBezier)_drawing=NO;
|
||||
if(!masks.count){_contentHeight=0;_drawing=_canvasActive=NO;[_maskID release];_maskID=nil;_refreshing=NO;return;}[_list selectItemAtIndex:selected];if(![_maskID isEqual:masks[selected][@"id"]])_drawing=_canvasActive=_trackingBusy=NO;[_maskID release];_maskID=[masks[selected][@"id"]copy];NSDictionary *m=[self mask];DYMaskParameters p=DYMaskAtTime(m,time);if(p.kind!=DYMaskBezier)_drawing=NO;
|
||||
BOOL stamp=m[@"stampSource"]!=nil;_combine.hidden=_invert.hidden=stamp;
|
||||
for(NSView *v in @[_stampMode,_reference,_referenceReset,_manualKey,_lastTrusted,_stampGuide])v.hidden=!stamp;
|
||||
[_stampMode selectItemAtIndex:DYStampUsesLinkedTracking(m)?0:1];
|
||||
_stampGuide.stringValue=@"固定污点可直接覆盖。移动瑕疵先选同一表面的纹理作参考;纯色取样区用跟随模式。";_stampGuide.toolTip=_stampGuide.stringValue;
|
||||
_lastTrusted.enabled=CMTIME_IS_NUMERIC(DYTrackingRecordedTime(m,@"trackingLastTime"));
|
||||
_eye.state=[m[@"enabled"]boolValue]?NSControlStateValueOn:NSControlStateValueOff;_eye.image=[NSImage imageWithSystemSymbolName:[m[@"enabled"]boolValue]?@"eye":@"eye.slash" accessibilityDescription:@"启用蒙版"];[_combine selectItemAtIndex:[m[@"combine"]integerValue]];_invert.state=(p.flags&DYMaskInvert)?NSControlStateValueOn:NSControlStateValueOff;
|
||||
float values[]={p.strength,p.feather,p.centerX,p.centerY,p.width,p.height,float(p.angle*180.f/M_PI),p.gradientWidth,p.hueCenterTurns*360.f,p.hueCoreHalfWidth*360.f,p.hueSoftWidth*360.f,p.saturationRange.low,p.saturationRange.high,p.lightnessRange.low,p.lightnessRange.high,p.inputBlack,p.inputWhite,p.inputGamma};
|
||||
NSInteger visible=0;for(NSInteger i=0;i<_rows.count;i++){BOOL show=i==0||(i==1&&p.kind<3)||(i>=2&&i<=6&&p.kind<4&&(!stamp||i!=6))||(i==7&&p.kind==3)||(i>=8&&i<=14&&p.kind==4)||(i>=15&&p.kind>=4);NSDictionary *row=_rows[i];for(NSView *v in row.allValues)v.hidden=!show;if(!show)continue;visible++;double lo=0,hi=1;if(i==2||i==3)lo=-1,hi=2;if(i==4||i==5||i==7)lo=.001,hi=2;if(i==6)lo=-180,hi=180;if(i==8)hi=360;if(i==9||i==10)hi=180;if(i==15)hi=.99;if(i==16)lo=.01,hi=2;if(i==17)lo=.01,hi=4;NSSlider *slider=row[@"slider"];slider.minValue=lo;slider.maxValue=hi;slider.doubleValue=values[i];[row[@"field"]setStringValue:[NSString stringWithFormat:@"%.3f",values[i]]];}
|
||||
@@ -66,10 +78,11 @@
|
||||
[self updateDrawingControls];
|
||||
_status.stringValue=m[@"status"]?:([m[@"keys"]count]?[NSString stringWithFormat:@"%lu 个轨迹键 · 修改几何会在当前帧建立手工键",(unsigned long)[m[@"keys"]count]]:pen?@"重画钢笔后,点击起点或“完成绘制”闭合;取消或 Esc 保留原路径。":@"各蒙版只影响当前工具层");
|
||||
if([_nodeID isEqual:@"shared"]){_list.accessibilityLabel=@"共享蒙版";_add.toolTip=@"添加共享蒙版";_remove.toolTip=@"删除此共享蒙版及其模块关联,可撤销";if(!m[@"status"]&&!pen&&![m[@"keys"]count])_status.stringValue=[NSString stringWithFormat:@"共享给 %lu 个模块 · 编辑与跟踪同步更新所有关联模块",(unsigned long)DYToolIDsForSharedMask(doc,_maskID).count];}
|
||||
if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=@"分别跟踪取样与覆盖区域的位置和缩放。";}
|
||||
if(stamp){_remove.toolTip=@"删除仿制图章,可撤销";if(!m[@"status"]&&![m[@"keys"]count])_status.stringValue=DYStampUsesLinkedTracking(m)?@"取样随修复区移动,取样区无需纹理;黄色椭圆仅覆盖瑕疵。":@"独立跟踪要求取样区和覆盖区都有纹理;纯色取样请切换跟随模式。";}
|
||||
_status.toolTip=_status.stringValue;
|
||||
// Keep every scalar readable at the narrowest native inspector width. A
|
||||
// label/value line and a separate full-width slider avoid compressed controls.
|
||||
_contentHeight=136+(pen?84:0)+visible*58+(shape?184:0)+58;[self setNeedsLayout:YES];_refreshing=NO;
|
||||
_contentHeight=136+(stamp?168:0)+(pen?84:0)+visible*58+(shape?184:0)+58;[self setNeedsLayout:YES];_refreshing=NO;
|
||||
}
|
||||
- (void)layout{
|
||||
[super layout];CGFloat w=self.bounds.size.width;
|
||||
@@ -78,15 +91,20 @@
|
||||
NSInteger perColumn=MAX(1,NSInteger((h-48)/44));NSUInteger index=0;
|
||||
for(NSDictionary *row in _rows){NSTextField *label=row[@"label"];if(label.hidden)continue;CGFloat x=8+(index/perColumn)*184,y=42+(index%perColumn)*44;label.font=[NSFont systemFontOfSize:11];label.frame=NSMakeRect(x,y+3,100,18);[row[@"field"]setFont:[NSFont monospacedDigitSystemFontOfSize:11 weight:NSFontWeightRegular]];[row[@"field"]setFrame:NSMakeRect(x+108,y,66,22)];[row[@"slider"]setFrame:NSMakeRect(x,y+23,174,18)];index++;}
|
||||
CGFloat x=16+ceil(double(index)/perColumn)*184,y=42,aw=200;BOOL shape=_tracking.count&&![_tracking[0]isHidden],pen=_penRedraw&&!_penRedraw.hidden;
|
||||
if(_stampMode&&!_stampMode.hidden){
|
||||
_stampMode.frame=NSMakeRect(x,y,224,26);_reference.frame=NSMakeRect(x,y+32,114,25);_referenceReset.frame=NSMakeRect(x+120,y+32,104,25);_manualKey.frame=NSMakeRect(x,y+64,114,25);_lastTrusted.frame=NSMakeRect(x+120,y+64,104,25);_stampGuide.frame=NSMakeRect(x,y+96,224,MAX(18,MIN(76,h-y-100)));x+=240;
|
||||
}
|
||||
if(pen){_penRedraw.frame=NSMakeRect(x,y,aw,25);y+=29;_penFinish.frame=NSMakeRect(x,y,97,25);_penCancel.frame=NSMakeRect(x+103,y,97,25);y+=33;}
|
||||
if(shape){if(y+135>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*28,97,25)];y+=87;_clear.frame=NSMakeRect(x,y,aw,25);y+=28;}
|
||||
if(shape){if(y>42&&y+126>h-4){x+=216;y=42;}_trackingTitle.frame=NSMakeRect(x,y,aw,18);y+=20;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect(x+(i%2)*103,y+(i/2)*26,97,23)];y+=78;_clear.frame=NSMakeRect(x,y,aw,22);y+=26;}
|
||||
// Pen and tracking actions get adjacent columns when the short strip cannot
|
||||
// hold both; no vertical clipping and no hidden controls below the viewport.
|
||||
if(y+32>h){x+=216;y=42;}_status.font=[NSFont systemFontOfSize:10];_status.frame=NSMakeRect(x,y,aw,MIN(54,MAX(26,h-y-4)));return;
|
||||
}
|
||||
_eye.frame=NSMakeRect(0,4,32,34);_list.frame=NSMakeRect(38,4,MAX(60,w-114),34);_add.frame=NSMakeRect(w-70,4,32,34);_remove.frame=NSMakeRect(w-32,4,32,34);
|
||||
CGFloat combineWidth=MIN(112,MAX(90,w*.45));_combine.frame=NSMakeRect(0,46,combineWidth,34);_invert.frame=NSMakeRect(combineWidth+12,49,MAX(70,w-combineWidth-12),28);_canvas.frame=NSMakeRect(0,88,w,36);
|
||||
CGFloat y=136;if(_penRedraw&&!_penRedraw.hidden){CGFloat bw=(w-8)/2;_penRedraw.frame=NSMakeRect(0,y,bw,34);_penFinish.frame=NSMakeRect(bw+8,y,bw,34);_penCancel.frame=NSMakeRect(0,y+40,w,34);y+=84;}for(NSDictionary *r in _rows){NSTextField *label=r[@"label"];if(label.hidden)continue;label.frame=NSMakeRect(2,y+6,MAX(60,w-100),22);[r[@"field"]setFrame:NSMakeRect(w-90,y,88,32)];[r[@"slider"]setFrame:NSMakeRect(0,y+32,w,24)];y+=58;}
|
||||
CGFloat y=136;
|
||||
if(_stampMode&&!_stampMode.hidden){CGFloat half=(w-8)/2;_stampMode.frame=NSMakeRect(0,y,w,28);_reference.frame=NSMakeRect(0,y+34,half,28);_referenceReset.frame=NSMakeRect(half+8,y+34,half,28);_manualKey.frame=NSMakeRect(0,y+68,half,28);_lastTrusted.frame=NSMakeRect(half+8,y+68,half,28);_stampGuide.frame=NSMakeRect(0,y+102,w,58);y+=168;}
|
||||
if(_penRedraw&&!_penRedraw.hidden){CGFloat bw=(w-8)/2;_penRedraw.frame=NSMakeRect(0,y,bw,34);_penFinish.frame=NSMakeRect(bw+8,y,bw,34);_penCancel.frame=NSMakeRect(0,y+40,w,34);y+=84;}for(NSDictionary *r in _rows){NSTextField *label=r[@"label"];if(label.hidden)continue;label.frame=NSMakeRect(2,y+6,MAX(60,w-100),22);[r[@"field"]setFrame:NSMakeRect(w-90,y,88,32)];[r[@"slider"]setFrame:NSMakeRect(0,y+32,w,24)];y+=58;}
|
||||
if(_tracking.count&&![_tracking[0]isHidden]){_trackingTitle.frame=NSMakeRect(2,y+2,w-4,20);y+=28;CGFloat bw=(w-8)/2;const int order[]={0,4,1,3,2,5};for(int i=0;i<6;i++)[_tracking[order[i]]setFrame:NSMakeRect((i%2)*(bw+8),y+(i/2)*38,bw,34)];y+=114;_clear.frame=NSMakeRect(0,y,w,34);y+=42;}
|
||||
_status.frame=NSMakeRect(2,y+2,w-4,52);
|
||||
}
|
||||
@@ -102,7 +120,16 @@
|
||||
- (void)combine:(id)sender{[self edit:@"蒙版组合" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"combine"]=@(self->_combine.indexOfSelectedItem);}];}
|
||||
- (void)inverted:(NSButton*)sender{[self edit:@"反转蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){DYMaskParameters p;[m[@"parameters"]getBytes:&p length:sizeof(p)];if(sender.state)p.flags|=DYMaskInvert;else p.flags&=~DYMaskInvert;m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
|
||||
- (void)valueChanged:(NSControl*)sender{if(_refreshing)return;double value=sender.doubleValue;if([sender isKindOfClass:NSTextField.class]){NSString *text=[sender.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];NSScanner *scanner=[NSScanner scannerWithString:text];if(![scanner scanDouble:&value]||!scanner.isAtEnd){NSBeep();[self refreshWithDocument:_document time:_time];return;}}if(!std::isfinite(value)){NSBeep();return;}NSInteger i=sender.tag;[self edit:@"调整工具蒙版" block:^(NSMutableDictionary *d,NSMutableDictionary *m){BOOL stamp=m[@"stampSource"]!=nil,position=i==2||i==3;DYMaskParameters p=DYMaskAtTime(m,stamp&&!position?kCMTimeInvalid:self->_time);float *fields[]={&p.strength,&p.feather,&p.centerX,&p.centerY,&p.width,&p.height,&p.angle,&p.gradientWidth,&p.hueCenterTurns,&p.hueCoreHalfWidth,&p.hueSoftWidth,&p.saturationRange.low,&p.saturationRange.high,&p.lightnessRange.low,&p.lightnessRange.high,&p.inputBlack,&p.inputWhite,&p.inputGamma};*fields[i]=(i==6?value*M_PI/180:i>=8&&i<=10?value/360:value);if(stamp&&(i==4||i==5)){DYStampMotion motion=DYStampMotionAtTime(m,self->_time);*fields[i]/=i==4?motion.targetScaleX:motion.targetScaleY;}if(p.kind==DYMaskHSLKey)p.flags|=DYMaskHueEnabled|DYMaskSaturationEnabled|DYMaskLightnessEnabled;if(!dyValidMaskParameters(p))return;if([m[@"keys"]count]&&(stamp?position:i<8)){NSMutableArray *keys=[[m[@"keys"]mutableCopy]autorelease];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){CMTime t=CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]);return CMTimeCompare(t,self->_time)!=0;}]];[keys addObject:DYStampKey(self->_time,p,YES,1,DYStampMotionAtTime(m,self->_time))];[keys sortUsingComparator:^NSComparisonResult(NSDictionary *a,NSDictionary *b){CMTime x=CMTimeMakeWithEpoch([a[@"value"]longLongValue],[a[@"scale"]intValue],[a[@"epoch"]longLongValue]),y=CMTimeMakeWithEpoch([b[@"value"]longLongValue],[b[@"scale"]intValue],[b[@"epoch"]longLongValue]);return (NSComparisonResult)CMTimeCompare(x,y);}];m[@"keys"]=keys;}else m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];}];}
|
||||
- (void)updateDrawingControls{for(NSButton *button in _tracking)button.enabled=!_drawing;_clear.enabled=!_drawing&&[[self mask][@"keys"]count]>0;_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;}
|
||||
- (void)updateDrawingControls{
|
||||
if(!_list)return;
|
||||
for(NSButton *button in _tracking)button.enabled=!_drawing&&(!_trackingBusy||button.tag==9);
|
||||
_clear.enabled=!_drawing&&!_trackingBusy&&[[self mask][@"keys"]count]>0;
|
||||
for(NSControl *control in @[_stampMode,_reference,_referenceReset,_manualKey])control.enabled=!_drawing&&!_trackingBusy;
|
||||
_lastTrusted.enabled=!_drawing&&!_trackingBusy&&CMTIME_IS_NUMERIC(DYTrackingRecordedTime([self mask],@"trackingLastTime"));
|
||||
_penFinish.enabled=_drawing;_penCancel.enabled=_drawing;
|
||||
}
|
||||
- (void)stampModeChanged:(id)sender{[self edit:@"切换图章跟踪方式" block:^(NSMutableDictionary *d,NSMutableDictionary *m){m[@"stampTrackMode"]=self->_stampMode.indexOfSelectedItem==0?@"linked":@"independent";[m removeObjectsForKeys:@[@"status",@"trackingStopped"]];}];}
|
||||
- (void)stampCommand:(NSButton*)sender{[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasCommand" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"command":sender.identifier,@"timeValue":@(_time.value),@"timeScale":@(_time.timescale),@"timeEpoch":@(_time.epoch)}];}
|
||||
- (NSString*)canvasNodeID{return DYSharedMaskWithID(_document,_maskID)?@"shared":_nodeID;}
|
||||
- (BOOL)representsCanvasMask:(NSDictionary*)info{NSString *maskID=info[@"mask"];if(!maskID.length)return NO;if([info[@"node"]isEqual:_nodeID])return YES;if(!DYSharedMaskWithID(_document,maskID))return NO;for(NSDictionary *mask in DYMasksForTool(_document,_nodeID))if([mask[@"id"]isEqual:maskID])return YES;return NO;}
|
||||
- (void)canvasSelected:(NSNotification*)n{_canvasActive=[self representsCanvasMask:n.userInfo];if(_canvasActive){NSString *ID=[n.userInfo[@"mask"]copy];[_maskID release];_maskID=ID;_drawing=[n.userInfo[@"draw"]boolValue];}else _drawing=NO;[self updateDrawingControls];}
|
||||
@@ -125,9 +152,9 @@
|
||||
}
|
||||
m[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
m[@"keys"]=@[];
|
||||
[m removeObjectForKey:@"status"];
|
||||
[m removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
|
||||
}];
|
||||
}
|
||||
- (void)track:(NSButton*)sender{if(_drawing)return;[self canvas:nil];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrack" object:_host userInfo:@{@"node":[self canvasNodeID],@"mask":_maskID?:@"",@"direction":@(sender.tag)}];}
|
||||
- (void)trackingStatus:(NSNotification*)n{BOOL target=n.userInfo[@"mask"]?[self representsCanvasMask:n.userInfo]:[n.userInfo[@"node"]isEqual:_nodeID];if(target&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID]))_status.stringValue=n.userInfo[@"message"]?:@"";}
|
||||
- (void)trackingStatus:(NSNotification*)n{BOOL target=n.userInfo[@"mask"]?[self representsCanvasMask:n.userInfo]:[n.userInfo[@"node"]isEqual:_nodeID];if(target&&(!n.userInfo[@"mask"]||[n.userInfo[@"mask"]isEqual:_maskID])){_status.stringValue=n.userInfo[@"message"]?:@"";_status.toolTip=_status.stringValue;if(n.userInfo[@"tracking"]){_trackingBusy=[n.userInfo[@"tracking"]boolValue];[self updateDrawingControls];}}}
|
||||
@end
|
||||
@@ -15,6 +15,7 @@
|
||||
#import <os/log.h>
|
||||
#include "MaskCore/DYTracker.hpp"
|
||||
#include "MaskCore/DYVisionRegionTracker.hpp"
|
||||
#include "MaskCore/DYCloneTracking.hpp"
|
||||
#include "MaskCore/DYObjectTracker.hpp"
|
||||
#include <atomic>
|
||||
#include "DYViewerParameterBridge.inc.h"
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
// deferred until the gesture has finished and the callback has returned.
|
||||
- (void)postToolCanvasStatus:(NSString*)message {
|
||||
NSString *node=nil,*maskID=nil;uint64_t revision;@synchronized(self){node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];revision=_toolCanvasRevision;}
|
||||
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
|
||||
dispatch_async(dispatch_get_main_queue(),^{BOOL drawing;@synchronized(self){if(revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;if(message&&![message isEqual:@"已选中本层蒙版"]&&DYSharedMaskWithID(self->_toolCanvasDocument,maskID)[@"stampSource"])self->_toolTrackingMessages[maskID]=message;
|
||||
drawing=self->_toolDrawingPen||self->_toolDrawingShape||self->_toolDrawingStampReference||self->_toolCanvasCommitPending;}if(message)[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"message":message}];[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasState" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":maskID?:@"",@"drawing":@(drawing)}];});[node release];[maskID release];
|
||||
}
|
||||
- (void)discardToolCanvasDraft {
|
||||
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
|
||||
@synchronized(self){[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=NO;_toolCanvasHasHover=NO;_toolCanvasEditTime=kCMTimeInvalid;++_toolCanvasRevision;}[self postToolCanvasStatus:nil];
|
||||
}
|
||||
// OSC and custom actions can use different origins. Capture the action clock
|
||||
// after the first event, then compare that clock only with itself at commit.
|
||||
@@ -21,12 +22,12 @@
|
||||
});[original release];
|
||||
}
|
||||
- (void)commitToolCanvasDraftAtTime:(CMTime)eventTime {
|
||||
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp;
|
||||
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
|
||||
NSDictionary *draft=nil,*original=nil;NSString *node=nil,*maskID=nil;CMTime time;uint64_t revision;BOOL stampEdit,sourceEdit,resizeStamp,referenceEdit;
|
||||
@synchronized(self){if(!_toolCanvasDraft||!_toolCanvasOriginal)return;if(!CMTIME_IS_NUMERIC(eventTime)||CMTimeCompare(eventTime,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新绘制。"];return;}draft=[_toolCanvasDraft copy];original=[_toolCanvasOriginal copy];node=[_selectedToolNode copy];maskID=[_selectedToolMask copy];time=_toolCanvasEditTime;stampEdit=draft[@"stampSource"]!=nil;sourceEdit=_toolDragPart==DYCloneSourcePart;referenceEdit=_toolDragPart==DYCloneReferencePart;resizeStamp=stampEdit&&_toolDragPart>=2&&_toolDragPart<=5;
|
||||
// Keep the completed path visible until the authoritative write returns.
|
||||
// Discarding it here exposed the new pen mask's default rectangular nodes
|
||||
// during the OSC redraw that immediately follows the closing click.
|
||||
_toolDrawingPen=_toolDrawingShape=_toolCanvasHasHover=NO;revision=++_toolCanvasRevision;_toolCanvasCommitPending=YES;}
|
||||
_toolDrawingPen=_toolDrawingShape=_toolDrawingStampReference=_toolCanvasHasHover=NO;revision=++_toolCanvasRevision;_toolCanvasCommitPending=YES;}
|
||||
dispatch_async(dispatch_get_main_queue(),^{@try{
|
||||
@synchronized(self){if(self->_trackingActive.load()||revision!=self->_toolCanvasRevision||![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;BOOL changed=NO;
|
||||
@@ -40,17 +41,28 @@
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,writeTime).document),*current=[self toolMask:maskID node:node document:doc];
|
||||
if(!current||![current isEqual:original]){os_log(OS_LOG_DEFAULT,"dayu_pen_commit conflict current=%{public}d",current!=nil);[self postToolCanvasStatus:@"蒙版已在其它位置修改,本次画面草稿未覆盖它。"];return;}
|
||||
NSMutableDictionary *result=sourceEdit?[[draft mutableCopy]autorelease]:DYMutablePlist(draft);
|
||||
if(resizeStamp){
|
||||
if(referenceEdit){
|
||||
result=DYMutablePlist(current);result[@"stampReference"]=draft[@"stampReference"];
|
||||
}else if(sourceEdit&&[current[@"keys"]count]){
|
||||
NSArray *baseSource=current[@"stampSource"],*changedSource=draft[@"stampSource"];
|
||||
DYStampMotion motion=DYStampMotionAtTime(current,time);motion.active=true;
|
||||
motion.sourceOffsetX+=[changedSource[0]floatValue]-[baseSource[0]floatValue];
|
||||
motion.sourceOffsetY+=[changedSource[1]floatValue]-[baseSource[1]floatValue];
|
||||
result=DYMutablePlist(current);NSMutableArray *keys=result[@"keys"];
|
||||
[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)!=0;}]];
|
||||
if(!DYMergeTracking(result,@[DYStampKey(time,DYMaskAtTime(current,time),YES,1,motion)]))return;
|
||||
}else if(resizeStamp){
|
||||
DYMaskParameters p=DYMaskAtTime(result,kCMTimeInvalid),authored=DYMaskAtTime(current,kCMTimeInvalid);
|
||||
DYStampMotion motion=DYStampMotionAtTime(current,time);
|
||||
authored.width=p.width/motion.targetScaleX;authored.height=p.height/motion.targetScaleY;
|
||||
result[@"parameters"]=[NSData dataWithBytes:&authored length:sizeof(authored)];
|
||||
result[@"keys"]=current[@"keys"];
|
||||
}else if(!sourceEdit&&[current[@"keys"]count]){DYMaskParameters p=DYMaskAtTime(result,time);if(current[@"stampSource"])result[@"parameters"]=current[@"parameters"];NSMutableArray *keys=[[current[@"keys"]mutableCopy]autorelease];NSIndexSet *same=[keys indexesOfObjectsPassingTest:^BOOL(NSDictionary *key,NSUInteger i,BOOL *stop){return CMTimeCompare(CMTimeMakeWithEpoch([key[@"value"]longLongValue],[key[@"scale"]intValue],[key[@"epoch"]longLongValue]),time)==0;}];[keys removeObjectsAtIndexes:same];[keys addObject:DYStampKey(time,p,YES,1,DYStampMotionAtTime(current,time))];result[@"keys"]=@[];if(!DYMergeTracking(result,keys))return;}
|
||||
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
|
||||
[result removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
|
||||
if(DYValidToolMask(result)&&![current isEqual:result]){[current setDictionary:result];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:referenceEdit?@"设置图章跟踪参考":sourceEdit?@"移动图章取样点":stampEdit?@"编辑仿制图章":@"编辑工具蒙版"];changed=DYWriteTools(self->_apiManager,doc,writeTime);[undo endUndoGroup];if(changed){DYToolDocument *saved=[[[DYToolDocument alloc]init]autorelease];saved.document=doc;[self adoptToolCanvasDocument:saved.document];}else [self postToolCanvasStatus:stampEdit?@"宿主未保存图章修改,已保留上一次位置。":@"宿主未保存蒙版修改,请重试。"];}
|
||||
}@finally{[a endAction:self];}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_pen_commit result=%{public}d valid=%{public}d",changed,DYValidToolMask(draft));
|
||||
if(changed)[self postToolCanvasStatus:sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
|
||||
if(changed)[self postToolCanvasStatus:referenceEdit?@"跟踪参考已保存 · 绿色区域只用于跟踪,黄色修复范围保持不变":sourceEdit?@"图章取样点已移动 · 可一次撤销":stampEdit?@"图章已保存 · 可一次撤销":@"蒙版已保存 · 可一次撤销"];
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
}@finally{@synchronized(self){if(revision==self->_toolCanvasRevision){[self->_toolCanvasDraft release];self->_toolCanvasDraft=nil;[self->_toolCanvasOriginal release];self->_toolCanvasOriginal=nil;self->_toolCanvasEditTime=kCMTimeInvalid;}self->_toolCanvasCommitPending=NO;}[self postToolCanvasStatus:nil];}});[draft release];[original release];[node release];[maskID release];
|
||||
}
|
||||
@@ -58,6 +70,7 @@
|
||||
NSDictionary *info=notification.userInfo;@synchronized(self){if(![info[@"node"]isEqual:_selectedToolNode]||![info[@"mask"]isEqual:_selectedToolMask])return;}
|
||||
CMTime time=CMTimeMakeWithEpoch([info[@"timeValue"]longLongValue],[info[@"timeScale"]intValue],[info[@"timeEpoch"]longLongValue]);
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{time=DYHostDisplayedFrameTime(_apiManager,a.currentTime);}@finally{[a endAction:self];}}@synchronized(self){if(_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime))time=_toolCanvasEditTime;}if(!CMTIME_IS_NUMERIC(time))return;NSString *command=info[@"command"];
|
||||
if([@[@"reference",@"clearReference",@"manual",@"return"]containsObject:command]){[self cloneStampCommand:command mask:info[@"mask"] atTime:time];return;}
|
||||
if([command isEqual:@"finish"]||[command isEqual:@"cancel"])[self toolCanvasEvent:NSEventTypeKeyDown point:NSZeroPoint part:1 modifiers:0 key:[command isEqual:@"finish"]?13:27 time:time];
|
||||
}
|
||||
- (void)updateToolShapeDraftAtPoint:(NSPoint)point {
|
||||
@@ -68,6 +81,21 @@
|
||||
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time {
|
||||
if(!CMTIME_IS_NUMERIC(time)||!std::isfinite(point.x)||!std::isfinite(point.y))return;
|
||||
@synchronized(self){if(_trackingActive.load()||!_selectedToolNode||!_selectedToolMask)return;if(_toolCanvasCommitPending){NSString *node=[_selectedToolNode copy],*maskID=[_selectedToolMask copy];dispatch_async(dispatch_get_main_queue(),^{@synchronized(self){if(![node isEqual:self->_selectedToolNode]||![maskID isEqual:self->_selectedToolMask])return;}[self toolCanvasEvent:type point:point part:part modifiers:modifiers key:key time:time];});[node release];[maskID release];return;}
|
||||
if(_toolDrawingStampReference){
|
||||
if(type==NSEventTypeKeyDown&&key==27){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"已取消跟踪参考选择,保留原图章。"];return;}
|
||||
if(type==NSEventTypeLeftMouseDown&&part==DYCloneReferencePart){
|
||||
NSDictionary *stamp=[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!stamp[@"stampSource"])return;
|
||||
_toolCanvasOriginal=[DYMutablePlist(stamp)retain];_toolCanvasDraft=[DYMutablePlist(stamp)retain];_toolCanvasEditTime=time;_toolDragStart=point;_toolDragPart=DYCloneReferencePart;
|
||||
}
|
||||
if(_toolCanvasDraft&&(type==NSEventTypeLeftMouseDragged||type==NSEventTypeLeftMouseUp)){
|
||||
if(CMTimeCompare(time,_toolCanvasEditTime)!=0){[self discardToolCanvasDraft];[self postToolCanvasStatus:@"播放头已移动,请重新选择跟踪参考。"];return;}
|
||||
double x0=std::clamp(MIN(point.x,_toolDragStart.x),0.,1.),y0=std::clamp(MIN(point.y,_toolDragStart.y),0.,1.);
|
||||
double x1=std::clamp(MAX(point.x,_toolDragStart.x),0.,1.),y1=std::clamp(MAX(point.y,_toolDragStart.y),0.,1.);
|
||||
BOOL valid=DYSetStampReference(_toolCanvasDraft,NSMakeRect(x0,y0,x1-x0,y1-y0),time);
|
||||
if(type==NSEventTypeLeftMouseUp){if(valid)[self commitToolCanvasDraftAtTime:time];else{[self discardToolCanvasDraft];[self postToolCanvasStatus:@"参考区域太小或离修复区过远,请重新框选。"];}}
|
||||
}
|
||||
return;
|
||||
}
|
||||
if(part>=10000&&type==NSEventTypeLeftMouseDown){
|
||||
NSInteger item=part-10000;
|
||||
if(item==7){_toolShowCoverage=!_toolShowCoverage;return;}
|
||||
@@ -131,3 +159,32 @@
|
||||
if(type==NSEventTypeLeftMouseUp&&!_toolDrawingPen)[self commitToolCanvasDraftAtTime:time];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)eventTime {
|
||||
if(!maskID.length)return;
|
||||
dispatch_async(dispatch_get_main_queue(),^{
|
||||
@synchronized(self){if(self->_trackingActive.load()||![maskID isEqual:self->_selectedToolMask]||self->_toolCanvasCommitPending)return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a){[self toolStatus:@"宿主暂时无法编辑图章,请重试。"];return;}
|
||||
[a startAction:self];@try{
|
||||
CMTime time=DYHostDisplayedFrameTime(self->_apiManager,a.currentTime);if(!CMTIME_IS_NUMERIC(time))return;
|
||||
NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document),*stamp=(id)DYSharedMaskWithID(doc,maskID);if(!stamp[@"stampSource"])return;
|
||||
if([command isEqual:@"return"]){
|
||||
CMTime last=DYTrackingRecordedTime(stamp,@"trackingLastTime"),timeline=kCMTimeInvalid;
|
||||
if(CMTIME_IS_NUMERIC(last))[[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)]timelineTime:&timeline fromInputTime:last];
|
||||
NSError *error=nil;
|
||||
if(!CMTIME_IS_NUMERIC(timeline)||![[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)]movePlayheadToTime:timeline error:&error])[self toolStatus:@"暂时无法定位最后可信帧,请按提示中的片段时间定位。"];return;
|
||||
}
|
||||
BOOL cancelReference=[command isEqual:@"reference"]&&self->_toolDrawingStampReference;
|
||||
[self discardToolCanvasDraft];
|
||||
if(cancelReference){[self postToolCanvasStatus:@"已取消参考选择,保留原图章。"];return;}
|
||||
if([command isEqual:@"reference"]){@synchronized(self){self->_toolDrawingStampReference=YES;self->_toolCanvasHidden=NO;}[self postToolCanvasStatus:@"拖框选择同一表面上有纹理的跟踪参考;Esc 取消。"];return;}
|
||||
if([command isEqual:@"clearReference"]){[stamp removeObjectForKey:@"stampReference"];[stamp removeObjectForKey:@"status"];}
|
||||
else if([command isEqual:@"manual"]){if(!DYAddStampManualKey(stamp,time)){[self toolStatus:@"无法建立手工关键帧,请检查轨迹数量或重新定位。"];return;}}
|
||||
else return;
|
||||
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:[command isEqual:@"manual"]?@"设置图章手工关键帧":@"重置图章跟踪参考"];
|
||||
BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];
|
||||
if(written){[self adoptToolCanvasDocument:doc];[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];[self postToolCanvasStatus:[command isEqual:@"manual"]?@"手工关键帧已保存 · 移到另一帧拖动黄色修复区或青色取样点,帧间自动过渡。":@"已使用修复区域作为跟踪参考。"];}
|
||||
else [self toolStatus:@"宿主未保存图章修改,请重试。"];
|
||||
}@finally{[a endAction:self];}
|
||||
});
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
static const NSInteger DYCloneSourcePart=7;
|
||||
static const NSInteger DYCloneReferencePart=8;
|
||||
@class DYPlugIn;
|
||||
static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static dispatch_once_t once;dispatch_once(&once,^{map=[[NSMapTable strongToWeakObjectsMapTable]retain];});return map;}
|
||||
@interface DYPlugIn (ToolCanvas)
|
||||
@@ -11,4 +12,5 @@ static NSMapTable *DYToolCanvasSessions(void){static NSMapTable *map;static disp
|
||||
- (void)saveCanvasLevel:(NSDictionary *)state replacing:(NSDictionary *)previous completion:(void (^)(NSString *failure))completion;
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion;
|
||||
- (void)trackCloneStamp:(NSString*)stampID direction:(NSInteger)direction;
|
||||
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)time;
|
||||
@end
|
||||
@@ -29,3 +29,8 @@
|
||||
BOOL _trackingObjectMode;
|
||||
NSUInteger _trackingObjectPending,_trackingObjectRepaired;
|
||||
NSMutableDictionary *_toolCaptureDevices;
|
||||
NSMutableDictionary *_toolTrackingMessages;
|
||||
BOOL _toolDrawingStampReference,_trackingStampLinked,_trackingStopped;
|
||||
dy::TrackerROI _trackingStampTargetSeed;
|
||||
CMTime _trackingCurrentTime;
|
||||
std::atomic<double> _trackingHeartbeat;
|
||||
@@ -1,15 +1,17 @@
|
||||
- (void)initializeToolHost {
|
||||
_viewerParameterBridge=[[DYViewerParameterBridge alloc]initWithAPIManager:_apiManager];_viewerParameterBridge.renderer=_renderer;
|
||||
_toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid;
|
||||
_toolTrackingMessages=[NSMutableDictionary new];_toolCaptureDevices=[NSMutableDictionary new];_toolCanvasDocument=[[[[DYToolDocument alloc]init]autorelease].document copy];_toolSourceTime=kCMTimeInvalid;_toolCanvasEditTime=kCMTimeInvalid;
|
||||
NSNotificationCenter *n=NSNotificationCenter.defaultCenter;[n addObserver:self selector:@selector(toolCanvasSelection:) name:@"DYToolCanvasSelection" object:_apiManager];[n addObserver:self selector:@selector(toolCanvasCommand:) name:@"DYToolCanvasCommand" object:_apiManager];[n addObserver:self selector:@selector(toolTrackRequested:) name:@"DYToolTrack" object:_apiManager];
|
||||
}
|
||||
- (void)tearDownToolHost {
|
||||
[_viewerParameterBridge invalidate];[_viewerParameterBridge release];_viewerParameterBridge=nil;
|
||||
[_toolAnalysisTimer invalidate];[_toolAnalysisTimer release];@synchronized(DYToolCanvasSessions()){if(_toolSession)[DYToolCanvasSessions()removeObjectForKey:_toolSession];}
|
||||
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];
|
||||
[_toolCanvasDocument release];[_toolSession release];[_selectedToolNode release];[_selectedToolMask release];[_toolCanvasDraft release];[_toolCanvasOriginal release];[_trackingNode release];[_trackingMaskID release];[_trackingFrozenMask release];[_trackingCandidate release];[_trackingSamples release];[_trackingMessage release];[_trackingPreviewFrame release];[_toolCaptureDevices release];[_toolTrackingMessages release];
|
||||
}
|
||||
- (void)adoptToolCanvasDocument:(NSDictionary*)document {
|
||||
if(!document)return;@synchronized(self){[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
|
||||
if(!document)return;@synchronized(self){
|
||||
for(NSString *ID in [[_toolTrackingMessages.allKeys copy]autorelease])if(![DYSharedMaskWithID(document,ID)isEqual:DYSharedMaskWithID(_toolCanvasDocument,ID)])[_toolTrackingMessages removeObjectForKey:ID];
|
||||
[_toolCanvasDocument release];_toolCanvasDocument=[document copy];if([self toolMask:_selectedToolMask node:_selectedToolNode document:document])return;NSString *node=nil,*maskID=nil;for(NSString *type in DYToolTypes())for(NSDictionary *mask in DYMasksForTool(document,[@"base:" stringByAppendingString:type]))if(!node&&[mask[@"enabled"]boolValue]){node=[@"base:" stringByAppendingString:type];maskID=mask[@"id"];}for(NSDictionary *layer in document[@"layers"])for(NSDictionary *mask in DYMasksForTool(document,layer[@"id"]))if(!node&&[mask[@"enabled"]boolValue]){node=layer[@"id"];maskID=mask[@"id"];}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[maskID copy];}
|
||||
}
|
||||
- (void)scheduleToolCanvasRegistration {
|
||||
_toolCaptureEnabled=YES;dispatch_async(dispatch_get_main_queue(),^{id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{if(!self->_toolSession){NSString *session=NSUUID.UUID.UUIDString;id<FxParameterSettingAPI_v6>s=[self->_apiManager apiForProtocol:@protocol(FxParameterSettingAPI_v6)];BOOL accepted=[s setStringParameterValue:session toParameter:DYCanvasSessionParameterID];os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_registered accepted=%{public}d",(int)accepted);{self->_toolSession=[session copy];@synchronized(DYToolCanvasSessions()){[DYToolCanvasSessions()setObject:self forKey:session];}}}}@finally{[a endAction:self];}});
|
||||
@@ -17,9 +19,12 @@
|
||||
#include "DYToolGrayCapture.inc.h"
|
||||
- (NSMutableDictionary*)toolMask:(NSString*)maskID node:(NSString*)nodeID document:(NSDictionary*)doc {for(NSMutableDictionary *m in DYMasksForTool(doc,nodeID))if([m[@"id"]isEqual:maskID])return m;return nil;}
|
||||
- (void)toolStatus:(NSString*)message {
|
||||
NSString *node=[[_trackingNode?:_selectedToolNode copy]autorelease],*mask=[[_trackingMaskID?:_selectedToolMask copy]autorelease];dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});
|
||||
NSString *node=nil,*mask=nil;
|
||||
@synchronized(self){node=[(_trackingActive.load()?_trackingNode:_selectedToolNode)copy];mask=[(_trackingActive.load()?_trackingMaskID:_selectedToolMask)copy];if(mask)_toolTrackingMessages[mask]=message?:@"";}
|
||||
dispatch_async(dispatch_get_main_queue(),^{[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolTrackingStatus" object:self->_apiManager userInfo:@{@"node":node?:@"",@"mask":mask?:@"",@"message":message?:@""}];});[node release];[mask release];
|
||||
}
|
||||
- (void)postTrackingPreview:(NSDictionary*)frame active:(BOOL)active message:(NSString*)message {
|
||||
@synchronized(self){if(_trackingMaskID)_toolTrackingMessages[_trackingMaskID]=message?:@"";}
|
||||
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:frame?:@{}];
|
||||
info[@"node"]=_trackingNode?:@"";info[@"mask"]=_trackingMaskID?:@"";
|
||||
info[@"tracking"]=@(active);info[@"message"]=message;
|
||||
@@ -52,7 +57,7 @@
|
||||
});
|
||||
}
|
||||
- (void)toolCanvasSelection:(NSNotification*)notification {
|
||||
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected");
|
||||
NSString *node=notification.userInfo[@"node"],*mask=notification.userInfo[@"mask"];if(!node||!mask)return;@synchronized(self){if(![mask isEqual:_selectedToolMask])_toolDrawingStampReference=NO;}NSDictionary *document=notification.userInfo[@"document"];if(document&&DYValidToolDocument(document)){DYToolDocument *immutable=[[[DYToolDocument alloc]init]autorelease];immutable.document=document;[self adoptToolCanvasDocument:immutable.document];}os_log(OS_LOG_DEFAULT,"dayu_tool_canvas_selected");
|
||||
@synchronized(self){if(DYSharedMaskWithID(_toolCanvasDocument,mask))node=@"shared";if(_trackingActive.load()&&(![_trackingNode isEqual:node]||![_trackingMaskID isEqual:mask])){_trackingCancelled.store(true);_trackingDiscard=YES;}[_selectedToolNode release];_selectedToolNode=[node copy];[_selectedToolMask release];_selectedToolMask=[mask copy];_toolCanvasHidden=[notification.userInfo[@"hidden"]boolValue];_toolDrawingPen=[notification.userInfo[@"draw"]boolValue];NSDictionary *shape=[self toolMask:mask node:node document:_toolCanvasDocument];DYMaskParameters shapeParameters=DYMaskAtTime(shape,kCMTimeInvalid);_toolDrawingShape=shape&&shapeParameters.kind<2&&[notification.userInfo[@"drawShape"]boolValue];if(_toolDrawingShape)_toolDrawingPen=NO;++_toolCanvasRevision;_toolCanvasEditTime=kCMTimeInvalid;_toolDragPart=0;_toolCanvasHasHover=NO;[_toolCanvasDraft release];_toolCanvasDraft=nil;[_toolCanvasOriginal release];_toolCanvasOriginal=nil;}[self postToolCanvasStatus:_toolDrawingPen?@"钢笔:点击放点,拖出曲柄;点首节点或完成绘制闭合。":_toolDrawingShape?@"在画面按下并拖出蒙版区域;Esc 取消。":@"已选中本层蒙版"];
|
||||
}
|
||||
- (void)addCloneStampFrom:(NSPoint)source target:(NSRect)target atTime:(CMTime)time completion:(void (^)(NSString *failure))completion {
|
||||
@@ -80,6 +85,7 @@
|
||||
p.centerX=NSMidX(target);p.centerY=NSMidY(target);p.width=target.size.width;p.height=target.size.height;
|
||||
stamp[@"parameters"]=[NSData dataWithBytes:&p length:sizeof(p)];
|
||||
stamp[@"stampSource"]=@[@(source.x),@(source.y),@(p.width),@(p.height)];
|
||||
stamp[@"stampTrackMode"]=@"linked";
|
||||
id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];
|
||||
BOOL grouped=[undo startUndoGroup:@"创建仿制图章"];
|
||||
@try{
|
||||
@@ -149,11 +155,25 @@
|
||||
- (BOOL)toolCanvasVisible {@synchronized(self){return _selectedToolNode&&_selectedToolMask&&!_toolCanvasHidden;}}
|
||||
- (DYViewerParameterBridge*)viewerParameterBridge{return _viewerParameterBridge;}
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time {
|
||||
@synchronized(self){if(_toolCanvasHidden||!_selectedToolMask)return nil;BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;DYMaskParameters p=DYMaskAtTime(m,time);return @{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())};}
|
||||
@synchronized(self){
|
||||
if(_toolCanvasHidden||!_selectedToolMask)return nil;
|
||||
BOOL draftTime=_toolCanvasDraft&&CMTIME_IS_NUMERIC(_toolCanvasEditTime);if(draftTime)time=_toolCanvasEditTime;
|
||||
NSDictionary *m=draftTime?_toolCanvasDraft:[self toolMask:_selectedToolMask node:_selectedToolNode document:_toolCanvasDocument];if(!m)return nil;
|
||||
DYMaskParameters p=DYMaskAtTime(m,time);
|
||||
NSMutableDictionary *info=[NSMutableDictionary dictionaryWithDictionary:@{@"id":m[@"id"],@"parameters":[NSData dataWithBytes:&p length:sizeof(p)],@"nodes":(_toolDrawingPen&&!_toolCanvasDraft)?[NSData data]:(m[@"nodes"]?:[NSData data]),@"drawing":@(_toolDrawingPen),@"drawShape":@(_toolDrawingShape),@"shapeStarted":@(_toolDrawingShape&&_toolCanvasDraft!=nil),@"hover":(_toolDrawingPen&&_toolCanvasHasHover)?@[@(_toolCanvasHoverPoint.x),@(_toolCanvasHoverPoint.y)]:@[],@"coverage":@(_toolShowCoverage),@"stampSource":DYStampSourceAtTime(draftTime&&_toolDragPart!=DYCloneSourcePart&&_toolCanvasOriginal?_toolCanvasOriginal:m,time)?:@[],@"tracking":@(_trackingActive.load())}];
|
||||
if(m[@"stampSource"]){
|
||||
info[@"referenceDrawing"]=@(_toolDrawingStampReference);
|
||||
info[@"status"]=_toolDrawingStampReference?@"拖框选择同一表面上有纹理的参考区 · 不改变修复范围 · Esc 取消":(_toolTrackingMessages[m[@"id"]]?:m[@"status"]?:@"拖动青色十字调整取样;黄色椭圆覆盖瑕疵。纯色区域可先选择跟踪参考;固定污点无需跟踪。");
|
||||
info[@"trackingStopped"]=m[@"trackingStopped"]?:@NO;
|
||||
info[@"canReturn"]=@(CMTIME_IS_NUMERIC(DYTrackingRecordedTime(m,@"trackingLastTime")));
|
||||
if(m[@"stampReference"]){DYMaskParameters ref=DYStampReferenceAtTime(m,time);info[@"referenceShape"]=[NSData dataWithBytes:&ref length:sizeof(ref)];}
|
||||
}
|
||||
return info;
|
||||
}
|
||||
}
|
||||
- (void)toolTrackRequested:(NSNotification*)notification {
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{
|
||||
NSInteger direction=[notification.userInfo[@"direction"]integerValue];if(direction==9){_trackingCancelled.store(true);return;}@synchronized(self){if(_toolDrawingPen||_toolDrawingShape||_toolDrawingStampReference||_toolCanvasCommitPending){[self postToolCanvasStatus:@"请先完成或取消蒙版绘制,再开始跟踪。"];return;}}if(_trackingActive.load()){[self toolStatus:@"请先取消当前跟踪"];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a){[self toolStatus:@"宿主暂时无法开始分析,请重新选择片段后重试。"];return;}[a startAction:self];@try{
|
||||
id<FxAnalysisAPI>analysis=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[analysis analysisStateForEffect];if(!analysis||state==kFxAnalysisState_AnalysisRequested||state==kFxAnalysisState_AnalysisStarted){[self toolStatus:@"宿主未就绪,请等待当前分析结束"];return;}
|
||||
CMTime time=a.currentTime;
|
||||
if(!CMTIME_IS_NUMERIC(time)){[self toolStatus:@"请在时间线定位到有效画面后再开始跟踪"];return;}
|
||||
@@ -173,7 +193,11 @@
|
||||
std::min(8.f,[source[2] floatValue]*_trackingStampMotion.sourceScaleX),
|
||||
std::min(8.f,[source[3] floatValue]*_trackingStampMotion.sourceScaleY),0};
|
||||
}
|
||||
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingRunStart=_trackingStarted=NSProcessInfo.processInfo.systemUptime;
|
||||
_trackingStampLinked=source&&DYStampUsesLinkedTracking(mask);
|
||||
if(source){DYMaskParameters ref=DYStampReferenceAtTime(mask,time);_trackingStampTargetSeed={ref.centerX,ref.centerY,ref.width,ref.height,0};}
|
||||
_trackingStopped=NO;_trackingCurrentTime=_trackingPreviousTime=kCMTimeInvalid;
|
||||
@synchronized(self){[_toolTrackingMessages removeObjectForKey:mask[@"id"]];}
|
||||
_trackingReferenceTime=time;_trackingSeed=seed;_trackingBackward=direction<0;_trackingBoth=direction==0;_trackingSingle=std::abs((int)direction)==2;_trackingDiscard=NO;_trackingCancelled.store(false);_trackingFinishing.store(false);_trackingActive.store(true);++_trackingGeneration;_trackingRunStart=_trackingStarted=NSProcessInfo.processInfo.systemUptime;_trackingHeartbeat.store(_trackingStarted);
|
||||
_trackingPreviewInputRange=kCMTimeRangeInvalid;_trackingPreviewTotal=_trackingPreviewCompleted=0;
|
||||
@synchronized(self){[_trackingPreviewFrame release];_trackingPreviewFrame=nil;_trackingPreviewQueued=NO;}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_tool_track_start direction=%{public}ld reference=%{public}.6f cached=%{public}d",(long)direction,CMTimeGetSeconds(time),_trackingReferenceFrame.valid());
|
||||
@@ -191,10 +215,13 @@
|
||||
}@finally{[a endAction:self];}
|
||||
}
|
||||
- (void)pollToolAnalysis:(NSTimer*)timer {
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()||_trackingInFrame.load())return;id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxAnalysisAPI>api=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[api analysisStateForEffect];if(state==kFxAnalysisState_AnalysisCompleted||state==kFxAnalysisState_AnalysisInterrupted||(state==kFxAnalysisState_NotAnalyzing&&NSProcessInfo.processInfo.systemUptime-_trackingStarted>2))[self cleanupAnalysis:nil];}@finally{[a endAction:self];}
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()||_trackingInFrame.load())return;
|
||||
if(_trackingCancelled.load()){[self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:nil];return;}
|
||||
if(NSProcessInfo.processInfo.systemUptime-_trackingHeartbeat.load()>30){[self finishToolAnalysis:@"宿主超过 30 秒未返回新画面,跟踪已停止;请重新选择片段或使用手工关键帧。" error:nil];return;}
|
||||
id<FxCustomParameterActionAPI_v4>a=[_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(!a)return;[a startAction:self];@try{id<FxAnalysisAPI>api=[_apiManager apiForProtocol:@protocol(FxAnalysisAPI)];FxAnalysisState state=[api analysisStateForEffect];if(state==kFxAnalysisState_AnalysisCompleted||state==kFxAnalysisState_AnalysisInterrupted||(state==kFxAnalysisState_NotAnalyzing&&NSProcessInfo.processInfo.systemUptime-_trackingStarted>2))[self cleanupAnalysis:nil];}@finally{[a endAction:self];}
|
||||
}
|
||||
- (BOOL)stopToolAnalysis:(NSString*)message error:(NSError**)error {
|
||||
if(message){[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
|
||||
if(message){_trackingStopped=YES;[_trackingMessage release];_trackingMessage=[message copy];if(error)*error=[NSError errorWithDomain:@"com.dayu.color.tracking" code:2 userInfo:@{NSLocalizedDescriptionKey:message}];}[self cleanupAnalysis:nil];return NO;
|
||||
}
|
||||
- (BOOL)finishToolAnalysis:(NSString*)message error:(NSError**)error {
|
||||
// FxAnalyzer's quiet cancellation is an explicit SDK error sentinel. A bare
|
||||
@@ -220,11 +247,14 @@
|
||||
}
|
||||
std::vector<dy::FlowPoint>polygon;NSData *nodes=_trackingCandidate[@"nodes"];if(_trackingSeed.kind==DYMaskBezier){auto path=dyFlattenMask((const DYBezierNode*)nodes.bytes,nodes.length/sizeof(DYBezierNode));for(int i=0;i<path.count;i++)polygon.push_back({path.x[i],path.y[i]});}else if(_trackingSeed.kind==DYMaskRectangle)polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};else for(int i=0;i<128;i++){float angle=i*(2.f*M_PI/128);polygon.push_back({.5f*std::cos(angle),.5f*std::sin(angle)});}
|
||||
if(_trackingStampMotion.active)_stampSourceTracker.setMask(polygon);
|
||||
_trackingShapePolygon=polygon;_toolTracker.setMask(std::move(polygon));return YES;
|
||||
_trackingShapePolygon=polygon;
|
||||
if(_trackingStampMotion.active&&_trackingFrozenMask[@"stampReference"])polygon={{-.5f,-.5f},{.5f,-.5f},{.5f,.5f},{-.5f,.5f}};
|
||||
_toolTracker.setMask(std::move(polygon));return YES;
|
||||
}
|
||||
- (BOOL)finishToolTrackingLoss:(const dy::TrackResult&)lost region:(NSString*)region atTime:(CMTime)time error:(NSError**)error {
|
||||
NSString *reason=@"区域内运动不一致";
|
||||
switch(lost.failure){
|
||||
case dy::TrackFailure::InsufficientTexture:reason=@"区域纹理不足";break;
|
||||
case dy::TrackFailure::InsufficientMatches:reason=@"可用特征点不足";break;
|
||||
case dy::TrackFailure::LowConfidence:reason=@"运动可信度不足";break;
|
||||
case dy::TrackFailure::OutsideFrame:reason=@"目标已离开画面";break;
|
||||
@@ -233,14 +263,16 @@
|
||||
default:break;
|
||||
}
|
||||
os_log(OS_LOG_DEFAULT,"dayu_tool_track_loss region=%{public}@ time=%{public}.6f reason=%{public}d features=%{public}d matches=%{public}d inliers=%{public}d confidence=%{public}.3f residual=%{public}.3f",region?:@"蒙版",CMTimeGetSeconds(time),(int)lost.failure,lost.features,lost.matches,lost.inliers,lost.confidence,lost.medianError);
|
||||
NSString *detail=region?[NSString stringWithFormat:@"%@失去跟踪(%@)",region,reason]:reason;
|
||||
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@,已保留 %lu 帧可信轨迹;可调整区域后从此处继续",detail,(unsigned long)_trackingSamples.count] error:error];
|
||||
NSString *detail=region?[NSString stringWithFormat:@"%@%@(%@)",region,_trackingSamples.count?@"失去跟踪":@"无法开始跟踪",reason]:reason;
|
||||
NSString *next=_trackingStampMotion.active?@"选择同一表面上有纹理的跟踪参考,或设置手工关键帧。":@"调整蒙版后从最后可信帧继续。";
|
||||
return [self finishToolAnalysis:[NSString stringWithFormat:@"%@。%@",detail,next] error:error];
|
||||
}
|
||||
- (BOOL)analyzeFrame:(FxImageTile*)tile atTime:(CMTime)time error:(NSError**)error {
|
||||
if(!_trackingActive.load()||_trackingFinishing.load()){if(error)*error=[NSError errorWithDomain:FxPlugErrorDomain code:kFxError_UserCancelled userInfo:nil];return NO;}_trackingInFrame.store(true);uint64_t trackingSpan=DYBetaSpanBegin(@"tracking_frame",nil);@try{
|
||||
if(_trackingCancelled.load())return [self finishToolAnalysis:@"已取消;保留最后连续可信轨迹" error:error];if(_trackingSingle&&_trackingSamples.count>=2)return [self finishToolAnalysis:nil error:error];if(_trackingSamples.count>=DYToolKeyLimit)return [self finishToolAnalysis:@"轨迹已到数量上限,保留已完成部分" error:error];
|
||||
CMTime expected=CMTIME_IS_NUMERIC(_trackingPreviousTime)?(_trackingBackward?CMTimeSubtract(_trackingPreviousTime,_trackingFrameDuration):CMTimeAdd(_trackingPreviousTime,_trackingFrameDuration)):_trackingReferenceTime;if(!CMTIME_IS_NUMERIC(time)||time.epoch!=expected.epoch||CMTimeCompare(time,expected)!=0)return [self stopToolAnalysis:@"宿主帧序列不连续,停在最后可信帧" error:error];
|
||||
NSDictionary *preview=nil;
|
||||
_trackingCurrentTime=time;_trackingHeartbeat.store(NSProcessInfo.processInfo.systemUptime);
|
||||
dy::GrayFrame frame;
|
||||
const bool stamp=_trackingStampMotion.active;
|
||||
const bool objectMode=_trackingObjectMode&&!stamp;
|
||||
@@ -278,21 +310,28 @@
|
||||
if(!target.valid)return [self finishToolAnalysis:@"目标未能重新确认,已停止;请调整蒙版后继续" error:error];
|
||||
}else if(!_trackingSamples.count){
|
||||
os_log(OS_LOG_DEFAULT,"dayu_vision_region_worker main=%{public}d stamp=%{public}d",(int)NSThread.isMainThread,(int)stamp);
|
||||
dy::TrackerROI targetROI={_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
dy::TrackerROI targetROI=stamp?_trackingStampTargetSeed:dy::TrackerROI{_trackingSeed.centerX,_trackingSeed.centerY,_trackingSeed.width,_trackingSeed.height,_trackingSeed.angle};
|
||||
if(!_toolTracker.reset(frame,targetROI))
|
||||
return [self finishToolAnalysis:stamp?@"覆盖区域内纹理不足,原图章已保留":@"蒙版内纹理不足,原蒙版已保留" error:error];
|
||||
if(stamp&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
|
||||
return [self finishToolAnalysis:@"取样区域内纹理不足,原图章已保留" error:error];
|
||||
return [self finishToolTrackingLoss:_toolTracker.result() region:stamp?@"跟踪参考区域":@"蒙版区域" atTime:time error:error];
|
||||
if(stamp&&!_trackingStampLinked&&!_stampSourceTracker.reset(frame,_trackingStampSourceSeed))
|
||||
return [self finishToolTrackingLoss:_stampSourceTracker.result() region:@"独立取样区域(可切换为随修复区移动)" atTime:time error:error];
|
||||
target=_toolTracker.result();
|
||||
if(stamp)source=_stampSourceTracker.result();
|
||||
if(stamp&&!_trackingStampLinked)source=_stampSourceTracker.result();
|
||||
}else{
|
||||
target=_toolTracker.track(frame);
|
||||
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"覆盖区域":nil atTime:time error:error];
|
||||
if(stamp){
|
||||
if(!target.valid)return [self finishToolTrackingLoss:target region:stamp?@"跟踪参考区域":nil atTime:time error:error];
|
||||
if(stamp&&!_trackingStampLinked){
|
||||
source=_stampSourceTracker.track(frame);
|
||||
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
|
||||
}
|
||||
}
|
||||
if(stamp){
|
||||
dy::TrackResult reference=target;float aspect=float(frame.width)/frame.height;
|
||||
target=dy::cloneRegionFollowing(reference,_trackingStampTargetSeed,_trackingSeed.centerX,_trackingSeed.centerY,aspect);
|
||||
if(!target.valid)return [self finishToolTrackingLoss:target region:@"修复区域" atTime:time error:error];
|
||||
if(_trackingStampLinked)source=dy::cloneRegionFollowing(reference,_trackingStampTargetSeed,_trackingStampSourceSeed.cx,_trackingStampSourceSeed.cy,aspect);
|
||||
if(!source.valid)return [self finishToolTrackingLoss:source region:@"取样区域" atTime:time error:error];
|
||||
}
|
||||
DYMaskParameters p=DYMaskAtTime(_trackingFrozenMask,stamp?kCMTimeInvalid:time);
|
||||
p.centerX=target.cx;p.centerY=target.cy;
|
||||
float confidence=target.confidence;
|
||||
@@ -331,6 +370,7 @@
|
||||
sampled.width=_trackingStampSourceSeed.width*source.scaleX;
|
||||
sampled.height=_trackingStampSourceSeed.height*source.scaleY;
|
||||
packet[@"sourceShape"]=[NSData dataWithBytes:&sampled length:sizeof(sampled)];
|
||||
if(_trackingFrozenMask[@"stampReference"]){auto tracked=_toolTracker.result();DYMaskParameters ref=covered;ref.kind=DYMaskRectangle;ref.centerX=tracked.cx;ref.centerY=tracked.cy;ref.width=_trackingStampTargetSeed.width*tracked.scaleX;ref.height=_trackingStampTargetSeed.height*tracked.scaleY;ref.angle=tracked.rotation;packet[@"referenceShape"]=[NSData dataWithBytes:&ref length:sizeof(ref)];}
|
||||
}
|
||||
packet[@"shape"]=[NSData dataWithBytes:&covered length:sizeof(covered)];packet[@"predicted"]=@(objectStep.predicted);
|
||||
packet[@"nodes"]=_trackingFrozenMask[@"nodes"];
|
||||
@@ -356,13 +396,27 @@
|
||||
_objectTracker.stop();
|
||||
_toolTracker.stop();
|
||||
if(_trackingStampMotion.active)_stampSourceTracker.stop();
|
||||
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard;
|
||||
uint64_t generation=_trackingGeneration;BOOL second=_trackingBoth&&!_trackingBackward&&!_trackingCancelled.load()&&!_trackingDiscard&&!_trackingStopped;
|
||||
dispatch_async(dispatch_get_main_queue(),^{if(self->_trackingGeneration!=generation)return;
|
||||
if(!self->_trackingSingle)[self publishTrackingPreview];
|
||||
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);}
|
||||
if(second){self->_trackingBackward=YES;self->_trackingFinishing.store(false);self->_trackingStarted=NSProcessInfo.processInfo.systemUptime;self->_trackingHeartbeat.store(self->_trackingStarted);id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];BOOL started=NO;if(a){[a startAction:self];@try{started=[[self->_apiManager apiForProtocol:@protocol(FxAnalysisAPI)]startBackwardAnalysis:kFxAnalysisLocation_GPU error:nil];}@finally{[a endAction:self];}}if(started){[self toolStatus:@"正向完成,正在从同一起点反向跟踪…"];return;}self->_trackingFinishing.store(true);}
|
||||
BOOL hasResults=![self->_trackingCandidate[@"keys"]isEqual:self->_trackingFrozenMask[@"keys"]];NSString *message=self->_trackingMessage?:[NSString stringWithFormat:@"%@跟踪完成 · %lu 个轨迹键",self->_trackingBoth?@"双向":(self->_trackingBackward?@"反向":@"正向"),(unsigned long)[self->_trackingCandidate[@"keys"]count]];
|
||||
if(self->_trackingObjectRepaired)message=[message stringByAppendingFormat:@" · 补齐 %lu 帧短暂遮挡,请复核",(unsigned long)self->_trackingObjectRepaired];
|
||||
if(hasResults&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受轨迹,原蒙版已保留";}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
|
||||
BOOL failedStamp=self->_trackingStopped&&self->_trackingFrozenMask[@"stampSource"];
|
||||
if(failedStamp){
|
||||
double stopped=CMTIME_IS_NUMERIC(self->_trackingCurrentTime)?CMTimeGetSeconds(self->_trackingCurrentTime):CMTimeGetSeconds(self->_trackingReferenceTime);
|
||||
NSString *position=CMTIME_IS_NUMERIC(self->_trackingPreviousTime)?[NSString stringWithFormat:@"最后可信帧 %.3fs",CMTimeGetSeconds(self->_trackingPreviousTime)]:@"未生成新轨迹,原图章已保留";
|
||||
message=[NSString stringWithFormat:@"已停止 · %.3fs · %@。%@",stopped,position,message];
|
||||
}
|
||||
if((hasResults||failedStamp)&&!self->_trackingDiscard){id<FxCustomParameterActionAPI_v4>a=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(a){[a startAction:self];@try{NSMutableDictionary *doc=DYMutablePlist(DYReadTools(self->_apiManager,a.currentTime).document);NSString *node=DYSharedMaskWithID(doc,self->_trackingMaskID)?@"shared":self->_trackingNode;NSMutableDictionary *mask=[self toolMask:self->_trackingMaskID node:node document:doc];if(mask&&[mask isEqual:self->_trackingFrozenMask]){self->_trackingCandidate[@"status"]=message;
|
||||
if(mask[@"stampSource"]){
|
||||
self->_trackingCandidate[@"trackingStopped"]=@(self->_trackingStopped);
|
||||
for(NSString *field in @[@"trackingLastTime",@"trackingStopTime"])[self->_trackingCandidate removeObjectForKey:field];
|
||||
CMTime last=self->_trackingPreviousTime,stop=self->_trackingCurrentTime;
|
||||
if(CMTIME_IS_NUMERIC(last))self->_trackingCandidate[@"trackingLastTime"]=@[@(last.value),@(last.timescale),@(last.epoch)];
|
||||
if(CMTIME_IS_NUMERIC(stop))self->_trackingCandidate[@"trackingStopTime"]=@[@(stop.value),@(stop.timescale),@(stop.epoch)];
|
||||
}
|
||||
[mask setDictionary:self->_trackingCandidate];id<FxUndoAPI>undo=[self->_apiManager apiForProtocol:@protocol(FxUndoAPI)];[undo startUndoGroup:mask[@"stampSource"]?@"仿制图章跟踪":@"蒙版区域跟踪"];BOOL written=DYWriteTools(self->_apiManager,doc,a.currentTime);[undo endUndoGroup];if(!written)message=@"宿主未接受跟踪结果,原图章/蒙版已保留,请重试。";else [self adoptToolCanvasDocument:doc];}else message=@"目标工具或蒙版已更改,已丢弃过期跟踪结果";}@finally{[a endAction:self];}}}
|
||||
CMTime stepTime=self->_trackingPreviousTime;BOOL advance=self->_trackingSingle&&changed&&!self->_trackingDiscard&&!self->_trackingCancelled.load()&&CMTIME_IS_NUMERIC(stepTime);
|
||||
@synchronized(self->_toolCaptureDevices){for(NSMutableDictionary *entry in self->_toolCaptureDevices.allValues)[entry removeObjectsForKeys:@[@"encoded",@"bytes",@"buffer",@"previewBuffer",@"visionPool",@"visionWidth",@"visionHeight"]];}
|
||||
self->_trackingActive.store(false);if(advance){id<FxCustomParameterActionAPI_v4>seek=[self->_apiManager apiForProtocol:@protocol(FxCustomParameterActionAPI_v4)];if(seek){[seek startAction:self];@try{id<FxTimingAPI_v4>timing=[self->_apiManager apiForProtocol:@protocol(FxTimingAPI_v4)];CMTime timelineTime=kCMTimeInvalid;[timing timelineTime:&timelineTime fromInputTime:stepTime];id<FxCommandAPI_v2>command=[self->_apiManager apiForProtocol:@protocol(FxCommandAPI_v2)];if(CMTIME_IS_NUMERIC(timelineTime)){NSError *seekError=nil;BOOL moved=[command movePlayheadToTime:timelineTime error:&seekError];if(!moved)os_log(OS_LOG_DEFAULT,"dayu_tool_track_seek timeline=%{public}.6f code=%{public}ld",CMTimeGetSeconds(timelineTime),(long)seekError.code);}else message=[message stringByAppendingString:@";宿主未提供有效播放头位置"];}@finally{[seek endAction:self];}}}[self->_toolAnalysisTimer invalidate];[self->_toolAnalysisTimer release];self->_toolAnalysisTimer=nil;[NSNotificationCenter.defaultCenter postNotificationName:DYModelChanged object:self->_apiManager];
|
||||
@@ -372,7 +426,10 @@
|
||||
(unsigned long)self->_trackingDirectFrames,(unsigned long)self->_trackingCopiedFrames,
|
||||
(unsigned long)[self->_trackingCandidate[@"keys"]count]);
|
||||
if(self->_trackingSingle)[self toolStatus:message];
|
||||
else [self postTrackingPreview:nil active:NO message:message];
|
||||
else {
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYColorWorkspaceRequested" object:self->_apiManager userInfo:@{@"page":@"tracking"}];
|
||||
[self postTrackingPreview:nil active:NO message:message];
|
||||
}
|
||||
});return YES;
|
||||
}
|
||||
|
||||
|
||||
+22
-1
@@ -161,6 +161,14 @@
|
||||
[NSColor.blackColor setStroke];mark.lineWidth=3.5*_uiScale;[mark stroke];
|
||||
[NSColor.systemCyanColor setStroke];mark.lineWidth=1.5*_uiScale;[mark stroke];
|
||||
}
|
||||
- (NSRect)stampActionRect:(NSInteger)index{return NSOffsetRect([self stampControlRect:index],0,-30*_uiScale);}
|
||||
- (void)drawStampReference {
|
||||
NSData *data=_mask[@"referenceShape"];if(data.length!=sizeof(DYMaskParameters))return;
|
||||
DYMaskParameters p;[data getBytes:&p length:sizeof(p)];NSBezierPath *path=[NSBezierPath bezierPath];
|
||||
const float xy[][2]={{-.5,-.5},{.5,-.5},{.5,.5},{-.5,.5}};
|
||||
for(int i=0;i<4;i++){NSPoint q=[self canvasStampSource:NSMakePoint(p.centerX+xy[i][0]*p.width,p.centerY+xy[i][1]*p.height)];if(i)[path lineToPoint:q];else[path moveToPoint:q];}
|
||||
[path closePath];path.lineWidth=3*_uiScale;[NSColor.blackColor setStroke];[path stroke];CGFloat dash[]={5*_uiScale,3*_uiScale};[path setLineDash:dash count:2 phase:0];path.lineWidth=1.5*_uiScale;[NSColor.systemGreenColor setStroke];[path stroke];
|
||||
}
|
||||
- (void)drawStampControls{
|
||||
NSArray *source=_mask[@"stampSource"];
|
||||
if(_viewerControls.stampArmed){
|
||||
@@ -181,9 +189,17 @@
|
||||
[outline closePath];outline.lineWidth=2*_uiScale;[NSColor.systemCyanColor setStroke];[outline stroke];
|
||||
}
|
||||
}else if(source.count==4){
|
||||
[self drawStampReference];
|
||||
[self drawStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
|
||||
BOOL tracking=[_mask[@"tracking"]boolValue];
|
||||
NSArray *titles=tracking?@[@"停止跟踪"]:@[@"向后跟踪",@"双向跟踪",@"向前跟踪"];
|
||||
NSString *status=_mask[@"status"];
|
||||
if(status.length){
|
||||
NSRect box=NSMakeRect(NSMinX(_imageRect)+8*_uiScale,NSMinY(_imageRect)+10*_uiScale,MAX(1,MIN(NSWidth(_imageRect)-16*_uiScale,680*_uiScale)),64*_uiScale);
|
||||
DYDrawSoftControl(box,4,NO,NO,NO);NSMutableParagraphStyle *style=[[[NSMutableParagraphStyle alloc]init]autorelease];style.lineBreakMode=NSLineBreakByWordWrapping;
|
||||
[status drawInRect:NSInsetRect(box,7*_uiScale,5*_uiScale) withAttributes:@{NSForegroundColorAttributeName:[_mask[@"trackingStopped"]boolValue]?NSColor.systemOrangeColor:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:11*_uiScale],NSParagraphStyleAttributeName:style}];
|
||||
}
|
||||
if(!tracking){NSArray *actions=@[[_mask[@"referenceDrawing"]boolValue]?@"取消参考选择":@"选择跟踪参考",@"手工关键帧",@"最后可信帧"];for(NSInteger i=0;i<3;i++){NSRect cell=[self stampActionRect:i];DYDrawSoftControl(cell,4,NO,NO,NO);[actions[i]drawInRect:NSInsetRect(cell,4,4) withAttributes:@{NSForegroundColorAttributeName:i==2&&![_mask[@"canReturn"]boolValue]?NSColor.grayColor:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.45)]}];}}
|
||||
NSArray *titles=tracking?@[@"停止跟踪"]:[_mask[@"referenceDrawing"]boolValue]?@[]:@[@"向后跟踪",@"双向跟踪",@"向前跟踪"];
|
||||
for(NSUInteger i=0;i<titles.count;i++){
|
||||
NSRect cell=[self stampControlRect:i];DYDrawSoftControl(cell,4,NO,NO,NO);
|
||||
[titles[i] drawInRect:NSInsetRect(cell,6,4) withAttributes:@{NSForegroundColorAttributeName:NSColor.whiteColor,NSFontAttributeName:[NSFont systemFontOfSize:MAX(8.,NSHeight(cell)*.48)]}];
|
||||
@@ -240,6 +256,8 @@
|
||||
NSArray *source=_mask[@"stampSource"];
|
||||
if(source.count==4){
|
||||
BOOL tracking=[_mask[@"tracking"]boolValue];
|
||||
if(!tracking)for(NSInteger i=0;i<3;i++)if(NSPointInRect(point,[self stampActionRect:i]))return 10018+i;
|
||||
if(!tracking&&[_mask[@"referenceDrawing"]boolValue])return NSPointInRect(point,_imageRect)?DYCloneReferencePart:0;
|
||||
NSInteger count=tracking?1:3;
|
||||
for(NSInteger i=0;i<count;i++)if(NSPointInRect(point,[self stampControlRect:i]))return 10011+i;
|
||||
NSPoint cross=[self canvasStampSource:NSMakePoint([source[0]doubleValue],[source[1]doubleValue])];
|
||||
@@ -262,6 +280,9 @@
|
||||
if(type==NSEventTypeKeyDown&&key==27&&_viewerControls.stampArmed){
|
||||
_viewerControls.stampArmed=NO;[self clearStampCreation];return YES;
|
||||
}
|
||||
if(type==NSEventTypeLeftMouseDown&&part>=10018&&part<=10020){
|
||||
[plugin cloneStampCommand:@[@"reference",@"manual",@"return"][part-10018] mask:_mask[@"id"] atTime:time];return YES;
|
||||
}
|
||||
if(type==NSEventTypeLeftMouseDown&&part>=10011&&part<=10013){
|
||||
NSInteger direction=[_mask[@"tracking"]boolValue]?9:part-10012;
|
||||
[plugin trackCloneStamp:_mask[@"id"] direction:direction];return YES;
|
||||
|
||||
@@ -55,6 +55,11 @@ struct DYStampMotion {
|
||||
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time);
|
||||
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time);
|
||||
NSArray *DYStampSamplingScaleAtTime(NSDictionary *stamp,CMTime time);
|
||||
BOOL DYStampUsesLinkedTracking(NSDictionary *stamp);
|
||||
DYMaskParameters DYStampReferenceAtTime(NSDictionary *stamp,CMTime time);
|
||||
BOOL DYSetStampReference(NSMutableDictionary *stamp,NSRect rect,CMTime time);
|
||||
BOOL DYAddStampManualKey(NSMutableDictionary *stamp,CMTime time);
|
||||
CMTime DYTrackingRecordedTime(NSDictionary *mask,NSString *key);
|
||||
NSDictionary *DYStampKey(CMTime time,DYMaskParameters parameters,BOOL manual,float confidence,DYStampMotion motion);
|
||||
BOOL DYMergeTracking(NSMutableDictionary *mask,NSArray *samples,CMTime frameDuration=kCMTimeInvalid);
|
||||
BOOL DYMosaicTracksMask(NSDictionary *document,NSString *maskID);
|
||||
|
||||
+50
-1
@@ -98,10 +98,24 @@ BOOL DYValidToolMask(NSDictionary *mask){
|
||||
}
|
||||
id samplingScale=mask[@"stampSamplingScale"];
|
||||
if(samplingScale&&(!source||!validStampValues(samplingScale,2,0,1./256,256)))return NO;
|
||||
id mode=mask[@"stampTrackMode"],reference=mask[@"stampReference"];
|
||||
if(mode&&(!source||![@[@"linked",@"independent"]containsObject:mode]))return NO;
|
||||
if(reference){
|
||||
if(!source||![reference isKindOfClass:NSArray.class]||[reference count]!=4)return NO;
|
||||
for(NSUInteger i=0;i<4;i++)if(!finiteNumber(reference[i])||
|
||||
(i<2?fabs([reference[i]doubleValue])>2048:[reference[i]doubleValue]<.001||[reference[i]doubleValue]>2048))return NO;
|
||||
}
|
||||
if(mask[@"status"]&&(![mask[@"status"]isKindOfClass:NSString.class]||[mask[@"status"]length]>2000))return NO;
|
||||
if(mask[@"trackingStopped"]&&![@[@YES,@NO]containsObject:mask[@"trackingStopped"]])return NO;
|
||||
for(NSString *field in @[@"trackingLastTime",@"trackingStopTime"]){
|
||||
id value=mask[field];if(value&&(![value isKindOfClass:NSArray.class]||[value count]!=3))return NO;
|
||||
if(value){for(id n in value)if(!finiteNumber(n))return NO;if(!CMTIME_IS_NUMERIC(DYTrackingRecordedTime(mask,field)))return NO;}
|
||||
}
|
||||
const float *n=(const float*)nodes.bytes;for(NSUInteger i=0;i<nodes.length/4;i++)if(!std::isfinite(n[i])||fabs(n[i])>1000)return NO;
|
||||
NSArray *keys=mask[@"keys"];if(![keys isKindOfClass:NSArray.class]||keys.count>DYToolKeyLimit)return NO;CMTime last=kCMTimeInvalid;
|
||||
for(NSDictionary *k in keys){if(![k isKindOfClass:NSDictionary.class]||!finiteNumber(k[@"value"])||!finiteNumber(k[@"scale"])||!finiteNumber(k[@"epoch"])||!finiteNumber(k[@"manual"])||!finiteNumber(k[@"confidence"])||[k[@"confidence"]doubleValue]<0||[k[@"confidence"]doubleValue]>1)return NO;CMTime t=keyTime(k);DYMaskParameters q;if(!CMTIME_IS_NUMERIC(t)||!readParameters(k[@"parameters"],&q)||q.kind!=p.kind||(CMTIME_IS_NUMERIC(last)&&(last.epoch!=t.epoch||CMTimeCompare(last,t)>=0)))return NO;
|
||||
if(k[@"stampMotion"]&&(!source||!validStampValues(k[@"stampMotion"],6,2,1./16,16)))return NO;
|
||||
if(k[@"stampManualSource"]&&(!source||!k[@"stampMotion"]||![k[@"manual"]boolValue]||![@[@YES,@NO]containsObject:k[@"stampManualSource"]]))return NO;
|
||||
last=t;
|
||||
}return YES;
|
||||
}
|
||||
@@ -236,6 +250,36 @@ static DYStampMotion stampMotionInSpan(DYMaskKeySpan span){
|
||||
blend(a.targetScaleX,b.targetScaleX),blend(a.targetScaleY,b.targetScaleY),a.active||b.active};
|
||||
}
|
||||
DYStampMotion DYStampMotionAtTime(NSDictionary *stamp,CMTime time){return stampMotionInSpan(maskKeySpan(stamp,time));}
|
||||
BOOL DYStampUsesLinkedTracking(NSDictionary *stamp){return stamp[@"stampSource"]&&[stamp[@"stampTrackMode"]isEqual:@"linked"];}
|
||||
CMTime DYTrackingRecordedTime(NSDictionary *mask,NSString *key){
|
||||
NSArray *v=mask[key];if(![v isKindOfClass:NSArray.class]||v.count!=3)return kCMTimeInvalid;
|
||||
for(id n in v)if(!finiteNumber(n))return kCMTimeInvalid;
|
||||
double scale=[v[1]doubleValue];if(scale<1||scale>INT32_MAX||scale!=std::floor(scale))return kCMTimeInvalid;
|
||||
return CMTimeMakeWithEpoch([v[0]longLongValue],(int32_t)scale,[v[2]longLongValue]);
|
||||
}
|
||||
DYMaskParameters DYStampReferenceAtTime(NSDictionary *stamp,CMTime time){
|
||||
DYMaskParameters p=DYMaskAtTime(stamp,time);NSArray *ref=stamp[@"stampReference"];
|
||||
if(ref.count==4){p.centerX+=[ref[0]floatValue]*p.width;p.centerY+=[ref[1]floatValue]*p.height;p.width*=[ref[2]floatValue];p.height*=[ref[3]floatValue];p.kind=DYMaskRectangle;}
|
||||
p.feather=0;p.angle=0;return p;
|
||||
}
|
||||
BOOL DYSetStampReference(NSMutableDictionary *stamp,NSRect rect,CMTime time){
|
||||
if(!stamp[@"stampSource"]||!CMTIME_IS_NUMERIC(time)||!std::isfinite(NSMidX(rect))||!std::isfinite(NSMidY(rect))||
|
||||
!std::isfinite(NSWidth(rect))||!std::isfinite(NSHeight(rect))||NSWidth(rect)<.001||NSHeight(rect)<.001||
|
||||
NSMinX(rect)<0||NSMinY(rect)<0||NSMaxX(rect)>1||NSMaxY(rect)>1)return NO;
|
||||
DYMaskParameters p=DYMaskAtTime(stamp,time);
|
||||
NSArray *ref=@[@((NSMidX(rect)-p.centerX)/p.width),@((NSMidY(rect)-p.centerY)/p.height),@(NSWidth(rect)/p.width),@(NSHeight(rect)/p.height)];
|
||||
NSMutableDictionary *candidate=DYMutablePlist(stamp);candidate[@"stampReference"]=ref;
|
||||
if(!DYValidToolMask(candidate))return NO;stamp[@"stampReference"]=ref;[stamp removeObjectForKey:@"status"];return YES;
|
||||
}
|
||||
BOOL DYAddStampManualKey(NSMutableDictionary *stamp,CMTime time){
|
||||
if(!stamp[@"stampSource"]||!CMTIME_IS_NUMERIC(time))return NO;
|
||||
DYMaskParameters p=DYMaskAtTime(stamp,time);DYStampMotion motion=DYStampMotionAtTime(stamp,time);motion.active=true;
|
||||
NSMutableDictionary *candidate=DYMutablePlist(stamp);
|
||||
NSMutableArray *keys=candidate[@"keys"];[keys filterUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(NSDictionary *key,NSDictionary *bindings){return CMTimeCompare(keyTime(key),time)!=0;}]];
|
||||
if(!DYMergeTracking(candidate,@[DYStampKey(time,p,YES,1,motion)]))return NO;
|
||||
[candidate removeObjectsForKeys:@[@"status",@"trackingStopped",@"trackingLastTime",@"trackingStopTime"]];
|
||||
[stamp setDictionary:candidate];return YES;
|
||||
}
|
||||
NSArray *DYStampSourceAtTime(NSDictionary *stamp,CMTime time){
|
||||
NSArray *source=stamp[@"stampSource"];
|
||||
DYStampMotion motion=DYStampMotionAtTime(stamp,time);
|
||||
@@ -278,6 +322,7 @@ NSDictionary *DYStampKey(CMTime time,DYMaskParameters p,BOOL manual,float confid
|
||||
NSMutableDictionary *paired=[[key mutableCopy]autorelease];
|
||||
paired[@"stampMotion"]=@[@(motion.sourceOffsetX),@(motion.sourceOffsetY),@(motion.sourceScaleX),
|
||||
@(motion.sourceScaleY),@(motion.targetScaleX),@(motion.targetScaleY)];
|
||||
if(manual)paired[@"stampManualSource"]=@YES;
|
||||
return paired;
|
||||
}
|
||||
// Analysis supplies a contiguous pass in either time direction. A symmetric
|
||||
@@ -369,7 +414,11 @@ BOOL DYMergeTracking(NSMutableDictionary *m,NSArray *samples,CMTime frameDuratio
|
||||
if(key[@"stampMotion"]){
|
||||
NSUInteger slot=index.unsignedIntegerValue;
|
||||
NSMutableDictionary *authored=[[all[slot] mutableCopy]autorelease];
|
||||
authored[@"stampMotion"]=key[@"stampMotion"];
|
||||
if([authored[@"stampManualSource"]boolValue]&&![key[@"manual"]boolValue]){
|
||||
NSMutableArray *motion=[[key[@"stampMotion"]mutableCopy]autorelease];
|
||||
motion[0]=authored[@"stampMotion"][0];motion[1]=authored[@"stampMotion"][1];
|
||||
authored[@"stampMotion"]=motion;
|
||||
}else authored[@"stampMotion"]=key[@"stampMotion"];
|
||||
all[slot]=authored;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,6 +216,59 @@
|
||||
run.record(@"host-clone-stamp-source-loss-stops-both-tracks-at-last-paired-frame",
|
||||
paired&&ended&&[saved[@"keys"] count]==3&&[sourceLoss.domain isEqual:FxPlugErrorDomain]&&
|
||||
sourceLoss.code==kFxError_UserCancelled&&[sourceLoss.localizedDescription containsString:@"取样区域"]);
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"document":DYReadTools(base,kCMTimeZero).document}];
|
||||
int beforeReturn=host->_seekCount;
|
||||
[plugin cloneStampCommand:@"return" mask:stampID atTime:timeAt(2)];drain();
|
||||
run.record(@"clone-last-trusted-button-maps-input-time-to-host-timeline",host->_seekCount==beforeReturn+1&&CMTimeCompare(host->_time,timeAt(2))==0);
|
||||
|
||||
stamp[@"stampTrackMode"]=@"linked";DYWriteTools(base,stampDoc,kCMTimeZero);paired=requestStamp(0);
|
||||
for(int i=0;i<6&&paired;i++){pairedFrame(i,true);paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];}finish();
|
||||
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);motion=DYStampMotionAtTime(saved,timeAt(5));covered=DYMaskAtTime(saved,timeAt(5));sampled=DYStampSourceAtTime(saved,timeAt(5));
|
||||
run.record(@"linked-clone-tracks-with-completely-flat-clean-source",paired&&[saved[@"keys"]count]==6&&fabs([sampled[0]doubleValue]-(covered.centerX-.5*motion.targetScaleX))<1e-5&&fabs(motion.sourceScaleX-motion.targetScaleX)<1e-6);
|
||||
|
||||
// A tiny flat repair ellipse follows a separate textured rectangle without
|
||||
// increasing the pixels that the repair covers.
|
||||
NSMutableDictionary *referenceDoc=DYMutablePlist(stampDoc),*referenceStamp=(id)DYSharedMaskWithID(referenceDoc,stampID);
|
||||
DYMaskParameters tiny=target;tiny.centerX=.86;tiny.width=.02;tiny.height=.04;referenceStamp[@"parameters"]=[NSData dataWithBytes:&tiny length:sizeof(tiny)];
|
||||
BOOL referenceOK=DYSetStampReference(referenceStamp,NSMakeRect(.6,.25,.2,.5),kCMTimeZero);
|
||||
DYWriteTools(base,referenceDoc,kCMTimeZero);paired=requestStamp(0);
|
||||
for(int i=0;i<6&&paired;i++){
|
||||
pairedFrame(i,true);Pixels repairPixels=read(frame,gpu);float scale=1+i*.035f,cx=.75f+i*2.f/tw+(.86f-.75f)*scale,cy=.5f-i*.75f/th;
|
||||
for(NSUInteger y=0;y<th;y++)for(NSUInteger x=0;x<tw;x++)if(fabs(float(x)/tw-cx)<.035*scale&&fabs(float(y)/th-cy)<.08*scale){auto index=(y*tw+x)*4;repairPixels[index]=repairPixels[index+1]=repairPixels[index+2]=.1;}
|
||||
[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:repairPixels.data() bytesPerRow:tw*8];
|
||||
paired&=[plugin analyzeFrame:frame atTime:timeAt(i) error:nil];
|
||||
}finish();saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);covered=DYMaskAtTime(saved,timeAt(5));
|
||||
run.record(@"flat-small-repair-can-follow-separate-surface-reference",referenceOK&&paired&&[saved[@"keys"]count]==6&&fabs(covered.centerX-(.75+10./tw+(.86-.75)*1.175))<.008&&covered.width<.026&&covered.height<.052);
|
||||
|
||||
DYWriteTools(base,stampDoc,kCMTimeZero);host->_time=kCMTimeZero;host->_state=kFxAnalysisState_NotAnalyzing;int backwardBeforeLoss=host->_backwardStarts;
|
||||
[plugin toolTrackRequested:[NSNotification notificationWithName:@"DYToolTrack" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"direction":@0}]];
|
||||
paired=[plugin desiredAnalysisTimeRange:&desired forInputWithTimeRange:inputRange error:nil]&&[plugin setupAnalysisForTimeRange:desired frameDuration:timeAt(1) error:nil];
|
||||
[[frame metalTextureForDevice:gpu]replaceRegion:MTLRegionMake2D(0,0,tw,th) mipmapLevel:0 withBytes:flat.data() bytesPerRow:tw*8];
|
||||
BOOL failedSeed=![plugin analyzeFrame:frame atTime:kCMTimeZero error:nil];finish();saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:@"DYToolCanvasSelection" object:host userInfo:@{@"node":@"shared",@"mask":stampID,@"document":DYReadTools(base,kCMTimeZero).document}];
|
||||
NSDictionary *canvas=[(id<DYToolCanvasHostProbe>)plugin toolCanvasMaskAtTime:kCMTimeZero];
|
||||
run.record(@"clone-first-frame-failure-persists-canvas-reason-without-keys",paired&&failedSeed&&![saved[@"keys"]count]&&[saved[@"trackingStopped"]boolValue]&&[canvas[@"status"]containsString:@"纹理不足"]&&![canvas[@"tracking"]boolValue]&&[canvas[@"status"]containsString:@"手工关键帧"]);
|
||||
run.record(@"clone-bidirectional-first-loss-is-not-labelled-forward-complete",host->_backwardStarts==backwardBeforeLoss&&[saved[@"status"]containsString:@"已停止"]);
|
||||
[plugin cloneStampCommand:@"manual" mask:stampID atTime:kCMTimeZero];drain();saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
|
||||
run.record(@"clone-manual-key-command-starts-after-zero-frame-failure",[saved[@"keys"]count]==1&&[saved[@"keys"][0][@"manual"]boolValue]&&!saved[@"trackingStopped"]);
|
||||
host->_time=timeAt(5);id<DYToolCanvasHostProbe>canvasHost=(id)plugin;
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDown point:NSMakePoint(.25,.5) part:7 modifiers:0 key:0 time:timeAt(5)];
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDragged point:NSMakePoint(.3,.53) part:7 modifiers:0 key:0 time:timeAt(5)];
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseUp point:NSMakePoint(.3,.53) part:7 modifiers:0 key:0 time:timeAt(5)];drain();
|
||||
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
|
||||
run.record(@"clone-manual-source-drag-keys-current-frame-without-moving-earlier-source",[saved[@"keys"]count]==2&&fabs([DYStampSourceAtTime(saved,kCMTimeZero)[0]doubleValue]-.25)<1e-6&&fabs([DYStampSourceAtTime(saved,timeAt(5))[0]doubleValue]-.3)<1e-6&&fabs([saved[@"stampSource"][0]doubleValue]-.25)<1e-6);
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDown point:NSMakePoint(.75,.5) part:1 modifiers:0 key:0 time:timeAt(5)];
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDragged point:NSMakePoint(.8,.52) part:1 modifiers:0 key:0 time:timeAt(5)];
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseUp point:NSMakePoint(.8,.52) part:1 modifiers:0 key:0 time:timeAt(5)];drain();
|
||||
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);
|
||||
run.record(@"clone-manual-target-correction-preserves-source-key-at-same-frame",[saved[@"keys"]count]==2&&fabs(DYMaskAtTime(saved,timeAt(5)).centerX-.8)<1e-6&&fabs([DYStampSourceAtTime(saved,timeAt(5))[0]doubleValue]-.3)<1e-6);
|
||||
host->_time=kCMTimeZero;DYMaskParameters beforeReference=DYMaskAtTime(saved,kCMTimeZero);
|
||||
[plugin cloneStampCommand:@"reference" mask:stampID atTime:kCMTimeZero];drain();
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDown point:NSMakePoint(.4,.2) part:8 modifiers:0 key:0 time:kCMTimeZero];
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseDragged point:NSMakePoint(.7,.7) part:8 modifiers:0 key:0 time:kCMTimeZero];
|
||||
[canvasHost toolCanvasEvent:NSEventTypeLeftMouseUp point:NSMakePoint(.7,.7) part:8 modifiers:0 key:0 time:kCMTimeZero];drain();
|
||||
saved=DYSharedMaskWithID(DYReadTools(base,kCMTimeZero).document,stampID);DYMaskParameters afterReference=DYMaskAtTime(saved,kCMTimeZero),selectedReference=DYStampReferenceAtTime(saved,kCMTimeZero);
|
||||
run.record(@"clone-reference-draw-gesture-preserves-repair-and-manual-keys",saved[@"stampReference"]&&[saved[@"keys"]count]==2&&beforeReference.centerX==afterReference.centerX&&beforeReference.width==afterReference.width&&fabs(selectedReference.centerX-.55)<1e-6&&fabs(selectedReference.height-.5)<1e-6);
|
||||
}
|
||||
{
|
||||
NSMutableDictionary *objectDoc=DYMutablePlist([[[DYToolDocument alloc]init]autorelease].document),*objectMask=(id)DYAddSharedMask(objectDoc,DYMaskRectangle);
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
- (BOOL)setupAnalysisForTimeRange:(CMTimeRange)range frameDuration:(CMTime)duration error:(NSError**)error;
|
||||
- (BOOL)analyzeFrame:(FxImageTile*)frame atTime:(CMTime)time error:(NSError**)error;
|
||||
- (BOOL)cleanupAnalysis:(NSError**)error;
|
||||
- (void)cloneStampCommand:(NSString*)command mask:(NSString*)maskID atTime:(CMTime)time;
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile error:(NSError**)error;
|
||||
- (dy::GrayFrame)toolGrayFrame:(FxImageTile*)tile preview:(NSDictionary**)preview error:(NSError**)error;
|
||||
- (BOOL)captureTrackingTile:(FxImageTile*)tile gray:(dy::GrayFrame*)gray preview:(NSDictionary**)preview error:(NSError**)error;
|
||||
@@ -49,4 +50,5 @@
|
||||
- (void)scheduleToolCanvasRegistration;
|
||||
- (void)adoptToolCanvasDocument:(NSDictionary*)document;
|
||||
- (NSDictionary*)toolCanvasMaskAtTime:(CMTime)time;
|
||||
- (void)toolCanvasEvent:(NSEventType)type point:(NSPoint)point part:(NSInteger)part modifiers:(FxModifierKeys)modifiers key:(unichar)key time:(CMTime)time;
|
||||
@end
|
||||
@@ -42,7 +42,7 @@
|
||||
frame[@"sourceShape"]?@"取样与覆盖区域":@"蒙版轮廓"]:@"等待源帧";
|
||||
[self setNeedsDisplay:YES];
|
||||
}
|
||||
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source {
|
||||
- (void)drawShape:(NSData *)shape nodes:(NSData *)nodes inRect:(NSRect)rect source:(BOOL)source reference:(BOOL)reference {
|
||||
if(shape.length!=sizeof(DYMaskParameters))return;
|
||||
DYMaskParameters p;[shape getBytes:&p length:sizeof(p)];
|
||||
double aspect=rect.size.width/rect.size.height,c=cos(p.angle),s=sin(p.angle);
|
||||
@@ -64,7 +64,7 @@
|
||||
}
|
||||
[path closePath];path.lineWidth=3.5;[NSColor.blackColor setStroke];[path stroke];
|
||||
if(source){CGFloat dashes[]={4,3};[path setLineDash:dashes count:2 phase:0];}
|
||||
[(source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
|
||||
[(reference?NSColor.systemGreenColor:source?NSColor.systemCyanColor:NSColor.systemYellowColor) setStroke];path.lineWidth=1.6;[path stroke];
|
||||
}
|
||||
- (void)drawRect:(NSRect)dirty {
|
||||
[NSColor.blackColor setFill];NSRectFill(NSIntersectionRect(dirty,self.bounds));
|
||||
@@ -81,8 +81,9 @@
|
||||
}
|
||||
[_image drawInRect:picture fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1 respectFlipped:YES hints:nil];
|
||||
if([_frame[@"flip"] boolValue])[NSGraphicsContext restoreGraphicsState];
|
||||
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO];
|
||||
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES];
|
||||
[self drawShape:_frame[@"shape"] nodes:_frame[@"nodes"] inRect:picture source:NO reference:NO];
|
||||
[self drawShape:_frame[@"sourceShape"] nodes:nil inRect:picture source:YES reference:NO];
|
||||
if(_frame[@"referenceShape"]){[self drawShape:_frame[@"referenceShape"] nodes:nil inRect:picture source:YES reference:YES];}
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
}
|
||||
@end
|
||||
@@ -140,7 +141,7 @@
|
||||
self.identifier=@"DYTrackingPreview";
|
||||
_title=[DYThemeLabel labelWithString:@"跟踪预览"];_title.font=[NSFont systemFontOfSize:12 weight:NSFontWeightSemibold];
|
||||
_detail=[DYThemeLabel labelWithString:@""];_detail.font=[NSFont monospacedDigitSystemFontOfSize:10 weight:NSFontWeightRegular];
|
||||
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=2;_status.lineBreakMode=NSLineBreakByWordWrapping;
|
||||
_status=[DYThemeLabel labelWithString:@""];_status.font=[NSFont systemFontOfSize:11];_status.maximumNumberOfLines=4;_status.lineBreakMode=NSLineBreakByWordWrapping;
|
||||
_action=DYWorkspaceButton(@"停止跟踪",target,action);
|
||||
_progress=[[[DYTrackingProgressBar alloc]init]autorelease];_progress.accessibilityLabel=@"跟踪进度";
|
||||
_preview=[[[DYTrackingPreviewImage alloc]init]autorelease];[_preview showFrame:nil];
|
||||
@@ -155,9 +156,9 @@
|
||||
_title.frame=NSMakeRect(8,6,MAX(1,w-108),18);
|
||||
_action.frame=NSMakeRect(MAX(0,w-98),2,92,24);
|
||||
_progress.frame=NSMakeRect(8,28,body,10);
|
||||
_status.frame=NSMakeRect(8,43,body,32);
|
||||
_preview.frame=NSMakeRect(8,80,body,MAX(1,h-106));
|
||||
_detail.frame=NSMakeRect(8,MAX(80,h-22),body,18);
|
||||
_status.frame=NSMakeRect(8,43,body,64);
|
||||
_preview.frame=NSMakeRect(8,112,body,MAX(1,h-138));
|
||||
_detail.frame=NSMakeRect(8,MAX(112,h-22),body,18);
|
||||
}
|
||||
- (void)applyUpdate:(NSDictionary *)info {
|
||||
if(![_maskID isEqual:info[@"mask"]]){[_maskID release];_maskID=[info[@"mask"]copy];}
|
||||
@@ -167,7 +168,7 @@
|
||||
BOOL stamp=info[@"sourceShape"]!=nil;
|
||||
_title.stringValue=stamp?@"图章跟踪预览":@"蒙版跟踪预览";
|
||||
[_preview showFrame:info];
|
||||
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?@"青色取样 · 黄色覆盖":@"黄色轮廓"];
|
||||
_detail.stringValue=[NSString stringWithFormat:@"%.3fs %@",[info[@"time"] doubleValue],stamp?(info[@"referenceShape"]?@"青色取样 · 黄色覆盖 · 绿色参考":@"青色取样 · 黄色覆盖"):@"黄色轮廓"];
|
||||
}
|
||||
NSUInteger total=[info[@"total"] unsignedIntegerValue];
|
||||
if(active)_progress.doubleValue=total?[info[@"completed"] doubleValue]/total:0;
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
#pragma once
|
||||
#include "DYTracker.hpp"
|
||||
|
||||
namespace dy {
|
||||
// Map a repair/sample centre through the motion of a separate reference on
|
||||
// the same surface. Normalized X and Y have different pixel units.
|
||||
inline TrackResult cloneRegionFollowing(const TrackResult& reference, TrackerROI seed,
|
||||
float cx, float cy, float aspect) {
|
||||
TrackResult result=reference;
|
||||
if(!reference.valid||!std::isfinite(aspect)||aspect<=0){result.valid=false;return result;}
|
||||
float x=(cx-seed.cx)*aspect*reference.scaleX;
|
||||
float y=(cy-seed.cy)*reference.scaleY;
|
||||
float c=std::cos(reference.rotation),s=std::sin(reference.rotation);
|
||||
result.cx=reference.cx+(x*c-y*s)/aspect;
|
||||
result.cy=reference.cy+x*s+y*c;
|
||||
if(!std::isfinite(result.cx)||!std::isfinite(result.cy)||
|
||||
result.cx<0||result.cx>1||result.cy<0||result.cy>1){
|
||||
result.valid=false;result.failure=TrackFailure::OutsideFrame;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,60 @@
|
||||
# 大鱼调色开发交接
|
||||
|
||||
更新于 2026-11-13(Asia/Shanghai)。当前入口;历史设计按需查阅专项记录。
|
||||
更新于 2026-11-14(Asia/Shanghai)。当前入口;历史设计按需查阅专项记录。
|
||||
|
||||
## 2026-11-14 执行环境诊断:确认是Local Work执行路径,尚未修复会话权限
|
||||
|
||||
用户要求查明并修复持续的权限阻塞。本轮读取本机应用日志与官方配置说明,确认当前由ChatGPT的 **Local Work executor** 通过远程协调的 `exec-server` 执行,不应把 `~/.codex/config.toml` 的完全访问直接等同于本轮Work步骤的实际权限。该配置确为 `danger-full-access`,项目trusted;常见的系统requirements/managed_config及本项目配置覆盖文件均不存在,但本轮实际仍为workspace-write、Git元数据只读、网络禁用。官方文档明确,云协调Work不一定消费普通本机默认值,执行与协调的策略范围独立。直接阻塞已确定为当前执行策略;尚未取得这轮策略的完整分配来源,不能声称已证明某项企业策略或应用缺陷。[本轮诊断](verification/ExecutionModeDiagnosis-20261114.json)
|
||||
|
||||
日志中的执行器插件复制曾出现ENOENT,后续第4次启动已恢复并连接,因此不能把该瞬态错误当成当前持续权限拒绝的根因。应用工具请求失败另有实测;尝试读取ChatGPT自身界面时,电脑控制工具明确返回 `Computer Use is not allowed to use the app 'com.openai.codex' for safety reasons.`,无法代用户操作自身应用的模式/环境入口。没有修改应用包、权限策略、系统配置或凭据,没有重启应用,也没有创建新任务。本轮只补充脱敏诊断和本交接;Git仍未提交/推送。
|
||||
|
||||
可核对的后续入口:官方文档的ChatGPT下拉菜单→Codex,执行环境选Local/This computer,并选择现有大鱼调色项目。该操作须由用户在应用界面完成;新执行会话先验证实际权限及网络,不以界面标签或配置文本代替运行检查。当前安装包/文章/仓库发布仍待执行,已准备的源码和文章模板都在本项目,按下方正式交付流程接续。该入口是执行环境选择,并非已验证的“重开必定修复”;如果新Codex本机会话仍受限,应继续核对其实际策略分配来源。
|
||||
|
||||
## 2026-11-14 22:42 发布继续:文章模板完成,着色器编译验证通过
|
||||
|
||||
用户要求继续完成既定发布。本轮继续核查,实际进程仍为 `CODEX_SANDBOX_NETWORK_DISABLED=1`,交付/仓库锁的原子创建仍返回errno 1,远端main回读仍因无法解析dayu.media退出128。没有更改权限配置、锁约定、产品源码或正式安装,也没有暂存、提交、推送及线上写入。
|
||||
|
||||
新增 [文章更新模板](Packaging/article-clone-repair-pending.json):准备标题、摘要、SEO、开头版本/下载说明、安装说明及8个新增正文区块,涵盖纯色取样随动、独立参考、停止原因、最后可信帧和手工关键帧。模板标为 `prepared-not-publishable`,未指定新版本号,且不是可直接提交的完整发布请求;JSON结构与区块检查通过。正式验收后必须回读届时线上文章为基线,仅按范围合并,保留历史图片、价格/会员权益、效果清单和App命令。现网文章没有更新。
|
||||
|
||||
本轮进一步确认Metal Toolchain确实已安装,现有27.1工具的直接版本查询成功,而xcrun工具发现仍失败。首次直接编译的5个AIR步骤通过,随后因默认模块缓存 `/Users/mac/.cache/clang/ModuleCache` 不可写而中止。仅在临时诊断进程显式选择同一现有工具,并以 `-fmodules-cache-path` 指向本任务临时目录后,按原 `tools/build_kernels.py` 输入完成 **5个AIR、2个Metal源文件及1次metallib链接,共8步通过**;产物961,236字节,SHA-256 `5acc6fc7abda835021b38455dcd4ee582691d31869ed2cf844a1ca0e933dc8cc`。未修改构建脚本、系统配置或主目录缓存;临时产物全部清理。[编译证据及先前失败诊断](verification/CloneRepairShaderBuild-20261114.json)。这是着色器构建验证,不是完整APP构建、GPU运行、正式自检或宿主验收。
|
||||
|
||||
当前正式版仍为 **1.22.1(133)**。前轮16个源码/检查程序摘要再次确认未变,24项结果仍仅代表其原有专项范围;新增9项正式安装检查及FCP验收尚未完成。完整APP、签名公证、PKG、Release、文章更新和Git推送均未完成。接手仍按下节流程先恢复实际执行能力;无需用户重复授权。恢复后还应核对Xcode实际发现的工具链及模块缓存,不能再把包装入口的“missing”消息当作未安装证明。
|
||||
|
||||
## 2026-11-14 22:26 发布接续:当前会话预检未通过
|
||||
|
||||
用户本轮明确要求“制作新的安装包更新文章和推送仓库”,已有发布授权继续有效。本轮复核正式安装仍为 **1.22.1(133)**,HEAD 仍为 `5a10408557cf4bb7dd96477ecc72829f48242a07`;仿制图章修复的全部16个源码/检查程序摘要与前轮验证记录一致,原有24项专项检查结果仍对应当前源码,未重复运行或将其升级为宿主验收。新版本号、实际编译提交、发行标签均尚未生成。[本轮预检](verification/ReleasePreparation-20261114.json) · [发布说明草稿](Packaging/release-notes-clone-repair-pending.md)
|
||||
|
||||
本轮实际尝试:创建产品交付锁与仓库锁均返回 `Operation not permitted`(errno 1);`dayu-git auth status` 返回 `Keychain access failed (status -50)`;`git ls-remote origin refs/heads/main` 退出128,无法解析 `dayu.media`;`xcrun --find metal` 能定位包装入口,但 `xcrun metal --version` 退出1并报告不能执行Metal Toolchain。这是当前会话本机权限、钥匙串、联网与工具链发现的阻塞,尚未到达服务器仓库写权限检查,不能归因于大鱼站未授权。当前会话的 `.git` 为只读;没有暂存、提交、推送或创建Release,也没有更改产品源码、版本、正式APP、安装包、文章15792及APP更新通道。本轮仅新增预检记录并更新本交接,尚未提交远端。
|
||||
|
||||
用户随后明确当前界面已经是完全访问模式。本机只读核对也确认 `/Users/mac/.codex/config.toml` 为 `sandbox_mode = "danger-full-access"`、`approval_policy = "never"`,项目为 `trusted`;但实际执行进程环境有 `CODEX_SANDBOX_NETWORK_DISABLED=1`,本轮下发的权限仍为受限写入及Git元数据只读。这说明已保存配置与当前会话执行权限不一致,无需用户再次开启完全访问或重复授权仓库;目前没有证据确认是模式路由、配置覆盖还是应用权限传递问题,不能直接诊断为应用故障。当前可用接口没有可修改本会话沙箱的操作;读取当前会话状态的应用接口也返回工具请求失败。
|
||||
|
||||
接手第一步:在具备原交付锁/仓库锁、固定构建缓存、钥匙串、正式安装目录和网络访问能力的本机会话重做预检。预检通过后,先审查并提交推送本轮及前轮未提交的修复(排除既有Xcode工程引用排序差异),回读远端;核对可用版本号,再执行 `tools/deliver.py` 完整签名公证安装及原生/FCP验收。验收通过后执行 `Packaging/build_pkg.py`、Release上传和完整下载校验,最后按届时线上文章15792的实际基线更新文案及主下载。此前24项专项检查不能替代新增9项正式安装检查及FCP验收。当前没有可供发布的新安装包。
|
||||
|
||||
## 2026-11-14 仿制图章修复:源码实现完成,正式验收与上线受阻
|
||||
|
||||
用户已授权“修复此问题,验收通过后更新在线安装包文章”;后续同范围的构建、验收、制包和文章更新无需再次确认。本轮实际完成源码修改,尚未完成正式验收或发布;唯一正式安装回读仍为 **1.22.1(133)**,未升版、签名、公证、安装新版本,也没有更改线上安装包、文章15792或主 APP 更新通道。[修复检查点](verification/CloneRepairFix-20261114.json) · [24项专项检查](verification/CloneRepairState-20261114.json) · [待发布说明和验收门槛](Packaging/release-notes-clone-repair-pending.md)
|
||||
|
||||
新建图章默认取样随修复区移动,纯色干净取样区不再独立参与纹理跟踪;旧图章保留原模式并增加切换入口。画布和面板可单独框选同一表面的绿色跟踪参考,不扩大黄色修复椭圆;支持首次手工关键帧、当前帧取样点关键帧及“最后可信帧”定位。失败原因、停止时间和最后可信位置在画布显示,首帧失败也保存状态;双向失败不再显示正向完成,宿主超过30秒未返回新帧时显示停止原因。手工取样位置增加标记,自动重跟踪保留该位置并允许更新缩放。
|
||||
|
||||
主要路径:`DYToolHostMethods.inc.h` 的配对/参考跟踪和结果保存;`DYToolCanvasEditing.inc.h` 的参考绘制、关键帧和定位;`DYToolOSC.inc.h`、`DYMaskPanel.inc.h` 与 `DYTrackingPreview.inc.h` 的控件和指引;`DYToolState.mm/.h` 的兼容字段、校验与关键帧;`MaskCore/DYCloneTracking.hpp` 的参考运动映射。完整文件摘要见修复记录。原有 `大鱼调色.xcodeproj/project.pbxproj` 引用排序差异保持,未修改版本元数据;不要把它混入本轮提交。
|
||||
|
||||
实际验证:`python3 tools/tracking/verify_clone_repair.py --output verification/CloneRepairState-20261114.json` **24项通过**,直接编译并调用当前 `DYToolState.mm`、`DYModel.mm` 与运动映射,覆盖独立模式兼容、纯色起点拒绝、参考与修复分离、运动换算、手工插值/保护、冷读字段和时间校验。隔离链接不调用无关色彩运行时,不能替代完整 APP。四个相关翻译单元(插件、面板、工作区、诊断)均成功编译为目标文件,状态/模型另由专项测试实际编译;末次变更的语法检查通过。增加9项正式安装原生宿主回归,覆盖纯色取样跟随、独立参考、零帧失败、双向停止、精确定位及手工取样/目标/参考手势;**尚未运行这9项**,也没有FCP/Motion/用户素材验收。
|
||||
|
||||
当前环境阻塞已实测:Release编译校验退出65,Xcode报告无法执行metal/无法发现Metal Toolchain;旧构建记录所指Metal编译器实际可读并能输出版本,故不能简单断言未安装,更不能跳过完整构建。正式交付锁 `/Users/mac/.codex/app-delivery-locks/com.dayu.color.lock` 与仓库互斥锁 `/Users/mac/.codex/git-backup-locks/…` 的创建均报 `Operation not permitted`;远端读取报 `Could not resolve host: dayu.media`。未运行暂存/提交/推送,Git HEAD仍为 `5a10408557cf4bb7dd96477ecc72829f48242a07`。本轮只做临时编译,未把未签名产物当作用户可运行版本;本轮临时构建目录、初始源码临时副本及独立测试可执行文件均已清理,24项结果及构建阻塞证据保存在上述验证记录。
|
||||
|
||||
接手第一步:恢复允许上述锁、固定构建缓存、签名/公证、正式安装与联网的会话,先检查本轮差异并按原锁约定提交推送、回读远端,再核对未占用的新版本号,通过 `tools/deliver.py` 完整交付并从正式位置运行自检与FCP验收。重点检查绿色参考框不会改修复范围、第一帧失败与冷重开提示、手工取样不移动此前帧、重跟踪不覆盖手工取样、撤销/重做及窄条布局。通过后才运行 `Packaging/build_pkg.py`、对应Release完整上传/下载校验,并以届时线上文章15792为基线更新说明与下载项;当前草稿不能提前发布。旧版安装包与文章继续有效。
|
||||
|
||||
## 2026-11-14 仿制图章跟踪与纯色修复排查
|
||||
|
||||
本轮按用户反馈核查当前实现与提示路径,未修改插件功能或发布。正式安装回读仍为 1.22.1(133);main 为 `5a10408557cf4bb7dd96477ecc72829f48242a07`,相关跟踪、图章、渲染和 UI 源码与正式编译节点 `7f833757da243f2a4610c23c36ec278b44c80ad4` 一致。原有 Xcode 工程引用排序差异保留;大鱼调色交付锁未占用。[排查与验证](verification/CloneStampTrackingAudit-20261114.json)
|
||||
|
||||
当前覆盖区与取样区分别用 Apple Vision 局部图像配准,均须通过区域内灰度纹理/相关性校验,任一失败即停止整对;不使用马赛克的目标重识别逻辑。图章实际保存中心与横纵缩放,渲染为当前帧原始像素复制加椭圆羽化,不会补画内容或完整应用旋转/透视。四种合成起点组合通过:纯色任一侧均初始化失败,两侧纹理均有效才允许开始;这解释了“干净取样区无纹理”阻断修复的现有限制。
|
||||
|
||||
创建时已有“选取样中心→拖覆盖椭圆”提示;跟踪失败原因主要发往工作区状态。画布保存后仅显示跟踪/停止按钮,未携带失败原因;首帧纹理失败不产生轨迹差异,也不会持久保存 mask.status。轨迹范围外沿用端点,连续分析也不主动将播放头移至最后可信帧,易让用户看到图章不再移动却不知原因。具体用户片段和 FCP 中的提示可见性尚未复现,不将静态推断当作实际宿主验收。
|
||||
|
||||
独立旧 Vision 连续运动测试本轮未通过:四模式第一张配准均报 Backend;临时诊断进一步取得 `com.apple.Vision` code 8、`Failed to create CVPixelBuffer`。这是本会话环境中的实测阻塞,不能记为通过,也不能据此认定正式 APP 新增回归。仅起点纯色校验已获本轮可运行验证;临时探针未修改产品头文件。
|
||||
|
||||
后续第一步:补充明确的画布失败状态、停止时刻/最后可信时刻与继续操作;将修复覆盖区和同表面的跟踪参考区分离,增加取样区跟随目标模式,保留独立跟踪选项,并补齐无轨迹时的手工键入口。画面固定污点目前可直接使用静态图章;随表面运动且取样区纯色的情况,现版没有上述自动跟随或参考区兜底。本轮只记录方案,尚未实现。本轮排查记录已本地保存;创建仓库互斥锁 `/Users/mac/.codex/git-backup-locks/` 被当前会话权限拒绝,未执行暂存、提交或推送,Git HEAD 保持上述节点。远端只读核验另因无法解析 `dayu.media` 失败。下次恢复目录/联网能力后,先审查本轮两个文档,按原锁约定提交推送并回读远端;不要混入既有 Xcode 工程差异。
|
||||
|
||||
## 2026-11-13 微信首次登录修复:已上线
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户