Ignore fully occluded inner cells in meat annotation and migrate RGBA labels

best_annotator/README.md

@@ -223,3 +223,11 @@ journalctl --user -u ddj-annotator.service -n 50
 ```
 
 首次迁移需先停止占用相同地址端口的旧标注进程，随后由 systemd 管理。模板仅绑定 ds 的局域网地址，其他机器需修改绑定地址和绝对路径。ds 已启用用户 lingering，服务可在退出 SSH 后继续运行并随机器启动。HTTP 服务重启不会终止已发起的独立模型任务。
+
+## Meat 正交遮挡排除
+
+Meat 标注、预选和训练统一使用 `same-part-face-orthographic-full-opaque-v1`。按每个部件的六个面法线做正交投影，考虑头部外壳总增厚 1、其他部件 0.5 的实际矩形覆盖；只排除被同部件完全不透明外层完整覆盖的内层格。部分露出、半透明遮挡和因其他肢体姿势造成的遮挡不算完全覆盖。
+
+`{id}_meat.png` 改为 64×64 RGBA：白色为 meat、黑色为非 meat、透明为忽略。原始 perfect/result 皮肤保持原样；标注视图及特征输入将忽略格的 RGBA 清零。训练快照另存 `visible_skin.png` 供核验。旧训练缓存必须保留，新的可见性版本重新提取特征。
+
+迁移命令：`python3 migrate_meat_visibility.py --root /path/to/DDJ --report /path/to/report.json` 先只读预检；添加 `--apply` 后转换当前有效标注，并在 `.meat_history/<id>/visibility-*` 备份旧 PNG/JSON。运行迁移时暂停标注服务写入，完成后重启；历史版本不重写。迁移可重复执行，已转换数据跳过。

best_annotator/meat_annotations.py

@@ -7,6 +7,7 @@ import zlib
 from datetime import datetime, timezone
 from pathlib import Path
 from uuid import uuid4
+from uv_visibility import POLICY, SCHEMA, visible_skin, annotation_mask
 
 
 def digest(data):
@@ -124,7 +125,7 @@ class MeatAnnotations:
         result['meat_status']='stale'
         try:
             p,data,_=self.effective_skin(r);info=json.loads(meta or b'{}')
-            if png is not None and info.get('skin_sha256')==digest(data) and info.get('skin_file')==p.name and info.get('mask_sha256')==digest(png) and info.get('schema')=='mc-meat-v1':
+            if png is not None and info.get('skin_sha256')==digest(data) and info.get('skin_file')==p.name and info.get('mask_sha256')==digest(png) and info.get('schema') in ('mc-meat-v1', SCHEMA):
                 result.update(meat_status='saved',meat_count=info['selected_count'],meat_url=self.ds.media(self.paths(r)[0]))
         except (ValueError,KeyError,self.Error):pass
         return result
@@ -136,15 +137,20 @@ class MeatAnnotations:
             p,data,revision=self.effective_skin(r)
             try:rgba=decode_rgba(data)
             except (ValueError,struct.error,zlib.error) as e:raise self.Error(str(e))
-            parts,valid,model=skin_parts(rgba);state=self.state(r)
+            parts,occupied,model=skin_parts(rgba);state=self.state(r)
+            rgba,valid,hidden=visible_skin(rgba,parts,occupied)
             selected=[]
             if state['meat_status']=='saved':
                 info=json.loads(self.paths(r)[1].read_text());selected=info['selected']
-                if any(type(i) is not int or i<0 or i>=4096 or not valid[i] for i in selected):raise self.Error('旧 meat 标注包含无效格，请检查文件',409)
-                if encode_mask(selected)!=self.paths(r)[0].read_bytes():raise self.Error('meat PNG 与记录不一致',409)
+                if any(type(i) is not int or i<0 or i>=4096 or not occupied[i] for i in selected):raise self.Error('旧 meat 标注包含无效格，请检查文件',409)
+                if info['schema']==SCHEMA and (info.get('visibility_policy')!=POLICY or info.get('valid_sha256')!=digest(valid)):
+                    raise self.Error('meat 遮挡规则或有效区校验不一致',409)
+                expected=encode_mask(selected) if info['schema']=='mc-meat-v1' else annotation_mask(selected,valid)
+                if expected!=self.paths(r)[0].read_bytes():raise self.Error('meat PNG 与记录不一致',409)
+                selected=[i for i in selected if valid[i]]
             return dict(key=key,id=r['id'],skin_file=p.name,skin_revision=digest(data),revision=revision,
                         rgba=base64.b64encode(rgba).decode(),valid=base64.b64encode(valid).decode(),parts=parts,model=model,
-                        selected=selected,**state)
+                        selected=selected,visibility_policy=POLICY,occluded_count=sum(hidden),**state)
 
     def save(self,body):
         with self.ds.lock:
@@ -154,10 +160,11 @@ class MeatAnnotations:
             chosen=body.get('selected');valid=base64.b64decode(current['valid'])
             if not isinstance(chosen,list) or len(chosen)>4096 or any(type(i) is not int or i<0 or i>=4096 or not valid[i] for i in chosen):
                 raise self.Error('只能选择当前皮肤上的有效 UV 格')
-            chosen=sorted(set(chosen));png=encode_mask(chosen)
-            metadata=dict(schema='mc-meat-v1',id=r['id'],skin_file=current['skin_file'],skin_sha256=current['skin_revision'],
+            chosen=sorted(set(chosen));png=annotation_mask(chosen,valid)
+            metadata=dict(schema=SCHEMA,id=r['id'],skin_file=current['skin_file'],skin_sha256=current['skin_revision'],
                           mask_sha256=digest(png),model=current['model'],selected=chosen,selected_count=len(chosen),
-                          encoding={'meat':255,'non_meat':0,'invalid':'ignore using original skin alpha and UV layout'},
+                          encoding={'meat':255,'non_meat':0,'invalid':'RGBA alpha=0; excluded from labels and loss'},
+                          visibility_policy=POLICY,valid_sha256=digest(valid),occluded_count=current['occluded_count'],
                           complete=True,updated_at=datetime.now(timezone.utc).isoformat())
             assistance=body.get('assistance')
             if assistance is not None:

best_annotator/meat_model.py

@@ -11,6 +11,7 @@ import time
 from uuid import uuid4
 
 from meat_annotations import digest, decode_rgba, skin_parts, encode_mask
+from uv_visibility import POLICY, SCHEMA, visible_skin, annotation_mask
 
 
 class MeatModel:
@@ -48,16 +49,18 @@ class MeatModel:
                     files,_=self.ds.meat.read_files(r);mask,mb=files
                     if mask is None or mb is None:raise ValueError('标注文件不完整')
                     meta=json.loads(mb)
-                    assert meta.get('complete') is True and meta.get('schema')=='mc-meat-v1','标注未完成'
+                    assert meta.get('complete') is True and meta.get('schema')==SCHEMA,'标注未完成'
                     assert meta['skin_file']==skin_path.name and meta['skin_sha256']==digest(skin),'皮肤已变化'
                     assert meta['mask_sha256']==digest(mask),'标签校验失败'
-                    raw=decode_rgba(skin);_,valid,model=skin_parts(raw)
+                    raw=decode_rgba(skin);parts,occupied,model=skin_parts(raw)
+                    _,valid,hidden=visible_skin(raw,parts,occupied)
+                    assert meta.get('visibility_policy')==POLICY and meta.get('valid_sha256')==digest(valid),'遮挡规则不匹配'
                     selected=meta['selected']
                     assert model=='classic','当前预选模型暂不支持纤细手臂'
                     assert set(raw[3::4]) <= {0,255},'当前预选模型暂不支持半透明皮肤'
                     assert isinstance(selected,list) and all(type(i) is int and 0<=i<4096 and valid[i] for i in selected),'无效选区'
                     assert len(set(selected))==len(selected) and meta['selected_count']==len(selected),'选区数量不符'
-                    assert meta['id']==r['id'] and meta['model']==model and encode_mask(selected)==mask,'标签内容不一致'
+                    assert meta['id']==r['id'] and meta['model']==model and annotation_mask(selected,valid)==mask,'标签内容不一致'
                     e=dict(id=r['id'],skin_sha256=digest(skin),mask_sha256=digest(mask),key=r['key'],
                            source_skin=str(skin_path.relative_to(self.ds.root)),source_annotation=str(paths[1].relative_to(self.ds.root)))
                     if include_bytes:e.update(skin=base64.b64encode(skin).decode(),mask=base64.b64encode(mask).decode(),metadata=base64.b64encode(mb).decode())
@@ -116,5 +119,6 @@ class MeatModel:
                 if current['skin_revision']!=info['skin_revision'] or pred['skin_revision']!=info['skin_revision']:
                     raise self.Error('皮肤已变化，已丢弃旧预选结果，请重新打开。',409)
                 valid=base64.b64decode(current['valid'])
-                if any(type(i) is not int or not 0<=i<4096 or not valid[i] for i in pred['selected']):raise self.Error('模型返回了无效格子',409)
+                if any(type(i) is not int or not 0<=i<4096 for i in pred['selected']):raise self.Error('模型返回了无效格子',409)
+                pred['selected']=[i for i in pred['selected'] if valid[i]]
         return result

best_annotator/migrate_meat_visibility.py

@@ -0,0 +1,74 @@
+"""Reversible migration of current human masks. Never alter original UVs or history."""
+import argparse
+import json
+from datetime import datetime,timezone
+from pathlib import Path
+from uuid import uuid4
+from app import Dataset
+from meat_annotations import decode_rgba,digest,skin_parts,encode_mask
+from uv_visibility import POLICY,SCHEMA,visible_skin,annotation_mask
+
+
+def migrate(ds,apply=False):
+    report=dict(policy=POLICY,apply=apply,rows=[],skipped=[],errors=[])
+    plans=[]
+    for r in ds.records.values():
+        png_path,meta_path=ds.meat.paths(r)
+        if not png_path.exists() and not meta_path.exists():continue
+        try:
+            (png,mb),revision=ds.meat.read_files(r)
+            skin_path,skin,_=ds.meat.effective_skin(r)
+            meta=json.loads(mb)
+            assert meta['complete'] is True
+            assert meta['skin_sha256']==digest(skin) and meta['skin_file']==skin_path.name
+            assert meta['mask_sha256']==digest(png)
+            raw=decode_rgba(skin);parts,occupied,model=skin_parts(raw)
+            shown,valid,hidden=visible_skin(raw,parts,occupied)
+            selected=meta['selected']
+            assert meta['model']==model and meta['id']==r['id']
+            assert all(type(i) is int and 0<=i<4096 and occupied[i] for i in selected)
+            assert len(set(selected))==len(selected)==meta['selected_count']
+            if meta['schema']==SCHEMA:
+                assert meta['visibility_policy']==POLICY and meta['valid_sha256']==digest(valid)
+                assert annotation_mask(selected,valid)==png
+                report['skipped'].append(dict(id=r['id'],reason='already_current'));continue
+            assert meta['schema']=='mc-meat-v1' and encode_mask(selected)==png
+            chosen=sorted(i for i in selected if valid[i]);new_png=annotation_mask(chosen,valid)
+            new_meta=dict(meta,schema=SCHEMA,selected=chosen,selected_count=len(chosen),mask_sha256=digest(new_png),
+                visibility_policy=POLICY,valid_sha256=digest(valid),occluded_count=sum(hidden),
+                encoding=dict(meat=255,non_meat=0,invalid='RGBA alpha=0; excluded from annotation and loss'),
+                migration=dict(from_schema=meta['schema'],old_mask_sha256=digest(png),old_metadata_sha256=digest(mb),
+                               at=datetime.now(timezone.utc).isoformat(),removed_selected=len(selected)-len(chosen)))
+            row=dict(id=r['id'],key=r['key'],occupied_cells=sum(occupied),valid_cells=sum(valid),occluded_cells=sum(hidden),
+                     old_meat=len(selected),new_meat=len(chosen),removed_meat=len(selected)-len(chosen),skin_sha256=digest(skin))
+            report['rows'].append(row)
+            plans.append((r,revision,skin_path,digest(skin),png,mb,new_png,new_meta,row))
+        except Exception as e:report['errors'].append(dict(id=r['id'],reason=str(e) or type(e).__name__))
+    if apply and report['errors']:raise ValueError('Migration preflight failed: '+json.dumps(report['errors']))
+    if apply:
+        for r,revision,skin_path,skin_hash,png,mb,new_png,new_meta,row in plans:
+            with ds.lock:
+                assert ds.meat.read_files(r)[1]==revision,'Annotation changed since planning'
+                assert digest(skin_path.read_bytes())==skin_hash,'Skin changed since planning'
+                archive=r['source'].parent/'.meat_history'/r['id']/('visibility-'+uuid4().hex)
+                archive.mkdir(parents=True)
+                paths=ds.meat.paths(r)
+                for p,b in zip(paths,[png,mb]):ds.write_bytes(archive/p.name,b)
+                try:
+                    ds.write_bytes(paths[0],new_png)
+                    ds.write_bytes(paths[1],(json.dumps(new_meta,ensure_ascii=False,indent=2)+'\n').encode())
+                    ds.meat.load(r['key'])
+                except BaseException:
+                    for p,b in zip(paths,[png,mb]):ds.write_bytes(p,b)
+                    raise
+                assert digest(skin_path.read_bytes())==skin_hash
+                row['backup']=str(archive)
+    report['totals']={k:sum(r[k] for r in report['rows']) for k in ['occupied_cells','valid_cells','occluded_cells','old_meat','new_meat','removed_meat']}
+    return report
+
+
+if __name__=='__main__':
+    p=argparse.ArgumentParser();p.add_argument('--root',type=Path,required=True);p.add_argument('--apply',action='store_true');p.add_argument('--report',type=Path,required=True)
+    a=p.parse_args();report=migrate(Dataset(a.root),a.apply)
+    a.report.parent.mkdir(parents=True,exist_ok=True);a.report.write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n')
+    print(json.dumps(dict(migrated=len(report['rows']),already_current=len(report['skipped']),errors=report['errors'],totals=report['totals']),ensure_ascii=False))

best_annotator/src/MeatEditor.jsx

@@ -133,7 +133,7 @@ export default function MeatEditor({ data, busy: saving, onSave, onDirty }) {
     }
   };
   return <div className="meat-editor">
-    <p className="meat-definition">meat：脸、眼睛、嘴巴和裸露身体。头发、胡须、眼镜、帽子、衣物和饰品不选。内外层分别标注。</p>
+    <p className="meat-definition">meat：脸、眼睛、嘴巴和裸露身体。头发、胡须、眼镜、帽子、衣物和饰品不选。内外层分别标注。正交投影被外层完全遮住的内层格已透明排除（{data.occluded_count || 0} 格）。</p>
     {data.meat_status==="stale"&&<p className="meat-warning">perfect 皮肤已变化，本次从空白标注开始；旧标注会在保存时归档。</p>}
     <MeatPreselect data={data} disabled={busy} onStart={()=>{finish();setPredicting(true);}} onEnd={()=>setPredicting(false)} onApply={p=>{
       const next=initialMask(p.selected);update(next);setHistory(h=>{const entries=[...h.entries.slice(0,h.index+1),next].slice(-60);return {entries,index:entries.length-1};});
@@ -156,7 +156,7 @@ export default function MeatEditor({ data, busy: saving, onSave, onDirty }) {
           <Canvas camera={{position:[30,22,38],fov:43}}><Scene data={data} rgba={rgba} mask={mask} layer={layer} animate={animate} view={view} viewEpoch={viewEpoch} pickDown={pickDown} pickUp={pickUp} hover={setHover}/></Canvas>
         </div>
       </section>
-      <section><h3>UV 逐格选择 <small>{hover===null?"可标注被遮住的表面":`UV (${hover%64}, ${Math.floor(hover/64)})`}</small></h3>
+      <section><h3>UV 逐格选择 <small>{hover===null?"透明区域不参与标注":`UV (${hover%64}, ${Math.floor(hover/64)})`}</small></h3>
         <canvas className="meat-uv" aria-label="64×64 meat UV 标注" width={512} height={512} ref={uvCanvas} onContextMenu={e=>e.preventDefault()} onPointerDown={e=>uvHit(e,true)} onPointerMove={e=>uvHit(e,false)} onPointerUp={finish} />
       </section>
     </div>

best_annotator/static/assets/MeatEditor-CVXi1jSA.js

@@ -0,0 +1,14 @@
+import{r as i,j as r,M as ue}from"./index-B2omGTon.js";import{aA as de,h as fe,am as me,t as he,u as W,ae as ge,D as pe,m as re,aw as ve,a0 as xe,a3 as be,ay as ye,aE as Z}from"./OrbitControls-BDsgiOyh.js";const we=["left","right","top","bottom","front","back"];function ae(n,a){const[l,h,b]=n.size,p=n.inflate,w=new de(l+p,h+p,b+p,l,h,b),d=w.toNonIndexed();w.dispose();const u=d.getAttribute("position"),o=d.getAttribute("uv"),s=[],f=[],c=[],v=[],M=[],T=new fe;for(const k of d.groups){const[G,O,Y,V,K,q]=n.faces[we[k.materialIndex]];for(let C=k.start;C<k.start+k.count;C+=3){let _=(o.getX(C)+o.getX(C+1)+o.getX(C+2))/3,R=(o.getY(C)+o.getY(C+1)+o.getY(C+2))/3;K&&(_=1-_),q&&(R=1-R);const H=G+Math.min(Y-1,Math.floor(_*Y)),P=O+Math.min(V-1,Math.floor((1-R)*V)),I=P*64+H;if(a[I*4+3]){T.setRGB(a[I*4]/255,a[I*4+1]/255,a[I*4+2]/255,me),v.push(I);for(let x=C;x<C+3;x++){s.push(u.getX(x),u.getY(x),u.getZ(x)),f.push(T.r,T.g,T.b);const X=K?1-o.getX(x):o.getX(x),N=q?1-o.getY(x):o.getY(x);c.push(re.clamp(X*Y-(H-G),0,1),re.clamp((1-N)*V-(P-O),0,1)),M.push(I)}}}}d.dispose();const D=new he;return D.setAttribute("position",new W(s,3)),D.setAttribute("color",new W(f,3)),D.setAttribute("meatCellUV",new W(c,2)),D.setAttribute("meatSelected",new W(new Float32Array(M.length),1)),D.userData={triangleIds:v,vertexIds:M},D}function Me(n,a){const l=n.getAttribute("meatSelected");n.userData.vertexIds.forEach((h,b)=>{l.array[b]=a[h]?1:0}),l.needsUpdate=!0}function je(n,a){const l=Array.from({length:4096},()=>new Set);for(const h of n){const b=ae(h,a),p=new Map,w=b.getAttribute("position"),d=b.userData.triangleIds,u=o=>[w.getX(o),w.getY(o),w.getZ(o)].map(s=>Math.round(s*1e4)).join(",");for(let o=0;o<d.length;o++){const s=[u(o*3),u(o*3+1),u(o*3+2)],f=d[o];for(let c=0;c<3;c++){const v=[s[c],s[(c+1)%3]].sort().join("|");p.has(v)||p.set(v,new Set),p.get(v).add(f)}}for(const o of p.values())for(const s of o)for(const f of o)s!==f&&l[s].add(f);b.dispose()}return l.map(h=>Array.from(h))}function Ce(n){const a=new ge({vertexColors:!0,side:pe});return a.onBeforeCompile=l=>{l.uniforms.meatPulse=n,l.vertexShader=`attribute float meatSelected; attribute vec2 meatCellUV; varying float vMeatSelected; varying vec2 vMeatCellUV;
+`+l.vertexShader,l.vertexShader=l.vertexShader.replace("#include <begin_vertex>",`#include <begin_vertex>
+vMeatSelected = meatSelected; vMeatCellUV = meatCellUV;`),l.fragmentShader=`uniform float meatPulse; varying float vMeatSelected; varying vec2 vMeatCellUV;
+`+l.fragmentShader,l.fragmentShader=l.fragmentShader.replace("#include <color_fragment>",`#include <color_fragment>
+      vec2 cellEdge = min(vMeatCellUV, 1.0 - vMeatCellUV);
+      vec2 edgePixels = cellEdge / max(fwidth(vMeatCellUV), vec2(0.00001));
+      float distanceToEdge = min(edgePixels.x, edgePixels.y);
+      // Keep the middle of every cell untouched, even when zoomed far out.
+      float borderOnly = 1.0 - smoothstep(0.12, 0.22, min(cellEdge.x, cellEdge.y));
+      float outline = (1.0 - smoothstep(0.65, 1.35, distanceToEdge)) * borderOnly;
+      float backing = (1.0 - smoothstep(1.25, 2.1, distanceToEdge)) * borderOnly;
+      diffuseColor.rgb = mix(diffuseColor.rgb, vec3(0.008, 0.04, 0.025), vMeatSelected * backing * meatPulse * 0.65);
+      diffuseColor.rgb = mix(diffuseColor.rgb, vec3(0.04, 1.0, 0.46), vMeatSelected * outline * meatPulse);
+    `)},a.customProgramCacheKey=()=>"meat-pulse-grid-v2",a}function Ee(n,a,l,h,b,p){if(!l[n]||!h[n])return[];const w=Math.max(0,Math.min(100,Number(p)||0)),d=new Uint8Array(4096),u=[n],o=[];for(d[n]=1;u.length;){const s=u.pop();if(!l[s]||!h[s])continue;let f=0;for(let c=0;c<3;c++)f+=(a[s*4+c]-a[n*4+c])**2;if(!(Math.sqrt(f/3)/255*100>w+1e-9)){o.push(s);for(const c of b[s])d[c]||(d[c]=1,u.push(c))}}return o}function Se(n){return{pointerId:n.pointerId,x:n.clientX,y:n.clientY,ctrl:n.ctrlKey,button:n.button,dragged:!1,cancelled:!n.isPrimary&&n.isPrimary!==void 0}}function oe(n,a){n&&n.pointerId===a.pointerId&&Math.hypot(a.clientX-n.x,a.clientY-n.y)>5&&(n.dragged=!0)}function ke(n){return!!n&&!n.dragged&&!n.cancelled&&(n.button===0||n.button===2&&n.ctrl)&&Number.isInteger(n.id)}const se=n=>Uint8Array.from(atob(n),a=>a.charCodeAt(0)),ie=n=>{const a=new Uint8Array(4096);return n.forEach(l=>a[l]=1),a};function Pe({part:n,rgba:a,mask:l,pulse:h,pickDown:b,pickUp:p,hover:w}){const d=i.useMemo(()=>ae(n,a),[n,a]),u=i.useMemo(()=>Ce(h),[h]);i.useEffect(()=>{Me(d,l)},[d,l]),i.useEffect(()=>()=>{d.dispose(),u.dispose()},[d,u]);const o=(s,f)=>{s.stopPropagation();const c=d.userData.triangleIds[s.faceIndex];c!==void 0&&(w(c),f==="down"&&b(c),f==="up"&&p())};return r.jsx("mesh",{geometry:d,material:u,position:n.center,onPointerDown:s=>o(s,"down"),onPointerMove:s=>o(s,"hover"),onPointerUp:s=>o(s,"up")})}function Ae({data:n,rgba:a,mask:l,layer:h,animate:b,view:p,viewEpoch:w,pickDown:d,pickUp:u,hover:o}){const s=i.useMemo(()=>({value:.85}),[]),f=i.useRef(),{camera:c}=xe();return be(({clock:v})=>{s.value=b?.68+.28*Math.sin(v.elapsedTime*Math.PI):.85}),i.useEffect(()=>{const v={angle:[30,22,38],front:[0,0,48],back:[0,0,-48],left:[48,0,0],right:[-48,0,0],top:[0,50,.01],bottom:[0,-52,.01]};c.position.set(...v[p]),c.lookAt(0,-2,0),f.current?.update()},[p,w,c]),r.jsxs(r.Fragment,{children:[n.parts.filter(v=>h==="both"||v.layer===(h==="inner"?0:1)).map(v=>r.jsx(Pe,{part:v,rgba:a,mask:l,pulse:s,pickDown:d,pickUp:u,hover:o},v.name+v.layer)),r.jsx(ye,{ref:f,target:[0,-2,0],enablePan:!1,enableDamping:!1,mouseButtons:{LEFT:Z.ROTATE,MIDDLE:Z.DOLLY,RIGHT:Z.ROTATE},minDistance:10,maxDistance:100})]})}function Ie({data:n,busy:a,onSave:l,onDirty:h}){const[b,p]=i.useState(!1),[w,d]=i.useState(null),u=a||b,o=i.useMemo(()=>se(n.rgba),[n.rgba]),s=i.useMemo(()=>se(n.valid),[n.valid]),f=i.useMemo(()=>ie(n.selected),[n]),[c,v]=i.useState(f),M=i.useRef(f),[T,D]=i.useState("toggle"),[k,G]=i.useState("both"),[O,Y]=i.useState("angle"),[V,K]=i.useState(12),[q,C]=i.useState(0),_=i.useMemo(()=>je(n.parts,o),[n.parts,o]),[R,H]=i.useState(!window.matchMedia?.("(prefers-reduced-motion: reduce)").matches),[P,I]=i.useState(null),[x,X]=i.useState({entries:[f],index:0}),N=i.useRef(null),J=i.useRef(null),Q=i.useRef(c),A=i.useRef(null),ee=i.useMemo(()=>({selected:c.reduce((e,t)=>e+t,0),valid:s.reduce((e,t)=>e+t,0)}),[c,s]),B=c.some((e,t)=>e!==f[t]),F=i.useMemo(()=>{const e=new Uint8Array(4096);return n.parts.forEach(t=>{k!=="both"&&t.layer!==(k==="inner"?0:1)||Object.values(t.faces).forEach(([g,y,E,U])=>{for(let S=y;S<y+U;S++)for(let L=g;L<g+E;L++)e[S*64+L]=1})}),e},[n,k]),$=e=>{M.current=e,Q.current=e,v(e)},j=()=>{N.current&&(M.current.some((e,t)=>e!==N.current.before[t])&&X(e=>{const t=[...e.entries.slice(0,e.index+1),M.current].slice(-60);return{entries:t,index:t.length-1}}),N.current=null)},te=(e,t=!1,g=!1)=>{if(u||!s[e]||!F[e]||(t&&(j(),N.current={before:M.current,value:T==="erase"?0:1-M.current[e],flood:g}),!N.current)||!t&&N.current.flood)return;const y=N.current.value,E=g&&t?Ee(e,o,s,F,_,V):[e];if(E.every(S=>M.current[S]===y))return;const U=M.current.slice();E.forEach(S=>U[S]=y),$(U)},le=e=>{A.current&&(A.current.id=e)},ce=()=>{const e=A.current;ke(e)&&(te(e.id,!0,e.ctrl),j()),e&&(e.cancelled=!0)};i.useEffect(()=>{h(B)},[B,h]),i.useEffect(()=>(window.addEventListener("pointerup",j),window.addEventListener("pointercancel",j),window.addEventListener("blur",j),()=>{window.removeEventListener("pointerup",j),window.removeEventListener("pointercancel",j),window.removeEventListener("blur",j)}),[]),i.useEffect(()=>{const e=t=>{B&&(t.preventDefault(),t.returnValue="")};return window.addEventListener("beforeunload",e),()=>window.removeEventListener("beforeunload",e)},[B]);const z=e=>{if(u)return;j();const t=x.index+e;t<0||t>=x.entries.length||($(x.entries[t]),X({...x,index:t}))};i.useEffect(()=>{const e=t=>{(t.ctrlKey||t.metaKey)&&t.key.toLowerCase()==="z"&&(t.preventDefault(),z(t.shiftKey?1:-1))};return window.addEventListener("keydown",e),()=>window.removeEventListener("keydown",e)}),i.useEffect(()=>{const e=J.current,t=e.getContext("2d"),g=document.createElement("canvas");g.width=64,g.height=64,g.getContext("2d").putImageData(new ImageData(new Uint8ClampedArray(o),64,64),0,0);let y,E=0;const U=S=>{if(S-E>40){E=S,t.clearRect(0,0,512,512),t.imageSmoothingEnabled=!1,t.drawImage(g,0,0,512,512);const L=R?.68+.28*Math.sin(S/1e3*Math.PI):.85;for(let m=0;m<4096;m++)(!s[m]||!F[m])&&(t.fillStyle="rgba(27,33,44,.72)",t.fillRect(m%64*8,Math.floor(m/64)*8,8,8));t.strokeStyle="rgba(0,0,0,.18)",t.lineWidth=.5,t.beginPath();for(let m=0;m<=64;m++)t.moveTo(m*8,0),t.lineTo(m*8,512),t.moveTo(0,m*8),t.lineTo(512,m*8);t.stroke(),t.beginPath();for(let m=0;m<4096;m++)s[m]&&F[m]&&Q.current[m]&&t.rect(m%64*8+.5,Math.floor(m/64)*8+.5,7,7);t.strokeStyle=`rgba(3,20,13,${L*.65})`,t.lineWidth=1.8,t.stroke(),t.strokeStyle=`rgba(25,255,157,${L})`,t.lineWidth=1,t.stroke(),P!==null&&(t.strokeStyle="#fff",t.lineWidth=2,t.strokeRect(P%64*8+1,Math.floor(P/64)*8+1,6,6))}y=requestAnimationFrame(U)};return y=requestAnimationFrame(U),()=>cancelAnimationFrame(y)},[o,s,F,R,P]);const ne=(e,t)=>{const g=e.currentTarget.getBoundingClientRect(),y=Math.floor((e.clientX-g.left)/g.width*64),E=Math.floor((e.clientY-g.top)/g.height*64);if(y<0||y>=64||E<0||E>=64)return;const U=E*64+y;I(U),(e.buttons===1||t&&e.ctrlKey&&e.button===2)&&(t&&e.currentTarget.setPointerCapture(e.pointerId),te(U,t,e.ctrlKey))};return r.jsxs("div",{className:"meat-editor",children:[r.jsxs("p",{className:"meat-definition",children:["meat：脸、眼睛、嘴巴和裸露身体。头发、胡须、眼镜、帽子、衣物和饰品不选。内外层分别标注。正交投影被外层完全遮住的内层格已透明排除（",n.occluded_count||0," 格）。"]}),n.meat_status==="stale"&&r.jsx("p",{className:"meat-warning",children:"perfect 皮肤已变化，本次从空白标注开始；旧标注会在保存时归档。"}),r.jsx(ue,{data:n,disabled:u,onStart:()=>{j(),p(!0)},onEnd:()=>p(!1),onApply:e=>{const t=ie(e.selected);$(t),X(g=>{const y=[...g.entries.slice(0,g.index+1),t].slice(-60);return{entries:y,index:y.length-1}}),d({model_id:e.model_id,checkpoint_sha256:e.checkpoint_sha256})}}),r.jsxs("div",{className:"meat-toolbar",children:[r.jsxs("div",{role:"group","aria-label":"标��方式",children:[r.jsx("button",{className:T==="toggle"?"active":"",onClick:()=>D("toggle"),children:"点击切换选中"}),r.jsx("button",{className:T==="erase"?"active":"",onClick:()=>D("erase"),children:"擦除"})]}),r.jsxs("label",{className:"meat-tolerance",children:["颜色容差 ",r.jsx("input",{"aria-label":"泛洪颜色容差",type:"range",min:"0",max:"100",step:"1",value:V,onChange:e=>K(Number(e.target.value))}),r.jsxs("output",{children:[V,"%"]})]}),r.jsxs("label",{children:["查看图层 ",r.jsxs("select",{value:k,onChange:e=>G(e.target.value),children:[r.jsx("option",{value:"both",children:"内层＋外层"}),r.jsx("option",{value:"inner",children:"仅内层"}),r.jsx("option",{value:"outer",children:"仅外层"})]})]}),r.jsx("button",{disabled:u||x.index===0,onClick:()=>z(-1),children:"撤销"}),r.jsx("button",{disabled:u||x.index===x.entries.length-1,onClick:()=>z(1),children:"重做"}),r.jsxs("label",{children:[r.jsx("input",{type:"checkbox",checked:R,onChange:e=>H(e.target.checked)}),"呼吸边框"]})]}),r.jsxs("div",{className:"meat-workspace",children:[r.jsxs("section",{children:[r.jsxs("h3",{children:["3D 选择 ",r.jsx("small",{children:"拖拽旋转 · 点击切换 · Ctrl＋点击泛洪 · 滚轮缩放"})]}),r.jsx("div",{className:"meat-views",children:Object.entries({angle:"斜视",front:"正面",back:"背面",left:"左侧",right:"右侧",top:"头顶",bottom:"底部"}).map(([e,t])=>r.jsx("button",{className:O===e?"active":"",onClick:()=>{Y(e),C(g=>g+1)},children:t},e))}),r.jsx("div",{className:"meat-stage",onContextMenu:e=>e.preventDefault(),onPointerDownCapture:e=>{e.isPrimary===!1?A.current&&(A.current.cancelled=!0):A.current=Se(e)},onPointerMoveCapture:e=>oe(A.current,e),onPointerUpCapture:e=>oe(A.current,e),onPointerCancelCapture:()=>{A.current&&(A.current.cancelled=!0)},children:r.jsx(ve,{camera:{position:[30,22,38],fov:43},children:r.jsx(Ae,{data:n,rgba:o,mask:c,layer:k,animate:R,view:O,viewEpoch:q,pickDown:le,pickUp:ce,hover:I})})})]}),r.jsxs("section",{children:[r.jsxs("h3",{children:["UV 逐格选择 ",r.jsx("small",{children:P===null?"透明区域不参与标注":`UV (${P%64}, ${Math.floor(P/64)})`})]}),r.jsx("canvas",{className:"meat-uv","aria-label":"64×64 meat UV 标注",width:512,height:512,ref:J,onContextMenu:e=>e.preventDefault(),onPointerDown:e=>ne(e,!0),onPointerMove:e=>ne(e,!1),onPointerUp:j})]})]}),r.jsx("p",{className:"meat-help",children:"绿色网格边框表示选中的 meat，格子内部保留皮肤原色。Ctrl＋点击：沿同一部件、同一层的相连表面选择近似颜色；已选区域再次点击即可取消，Ctrl＋点击已选格可批量取消。容差越大，包含颜色越多。UV 图可按住左键连续涂选或擦除。"}),r.jsxs("footer",{className:"meat-footer",children:[r.jsxs("span",{"aria-live":"polite",children:["已选 ",ee.selected," / ",ee.valid," 格",B?" · 未保存":"",r.jsxs("small",{children:["保存为 ",n.id,"_meat.png；未选择的有效格为非 meat。"]})]}),r.jsx("button",{className:"button secondary",disabled:u,onClick:()=>{j(),l(Array.from(M.current.keys()).filter(e=>M.current[e]),!1,w)},children:"保存 meat"}),r.jsx("button",{className:"button",disabled:u,onClick:()=>{j(),l(Array.from(M.current.keys()).filter(e=>M.current[e]),!0,w)},children:"保存并标注下一张"})]})]})}export{Ie as default};

best_annotator/static/index.html

@@ -1,3 +1,3 @@
-<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>DDJ · 最佳结果标注</title><script src="/vendor/skinview3d-3.4.2.bundle.js" defer></script>  <script type="module" crossorigin src="/assets/index-BizVrLwN.js"></script>
+<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>DDJ · 最佳结果标注</title><script src="/vendor/skinview3d-3.4.2.bundle.js" defer></script>  <script type="module" crossorigin src="/assets/index-B2omGTon.js"></script>
   <link rel="stylesheet" crossorigin href="/assets/index-D0g9WvcQ.css">
 </head><body><div id="root"></div></body></html>

best_annotator/test_meat.py

@@ -10,7 +10,18 @@ import zlib
 from app import Dataset, ReviewError
 from meat_annotations import decode_rgba, encode_mask, skin_parts
 from test_app import request_without_socket
-from test_perfect import skin_png
+from test_perfect import skin_png as plain_skin_png
+from uv_visibility import annotation_mask,visible_skin,encode_rgba
+
+def skin_png(color=b"\x10\x80\x40\xff"):
+    raw=bytearray(decode_rgba(plain_skin_png(color)));parts,_,_=skin_parts(raw)
+    for part in parts:
+        if part["layer"]:
+            for u,v,w,h,*_ in part["faces"].values():
+                for y in range(v,v+h):
+                    for x in range(u,u+w):raw[(y*64+x)*4+3]=0
+    raw[(8*64+40)*4: (8*64+40)*4+4]=color
+    return encode_rgba(raw)
 
 
 class MeatTest(unittest.TestCase):
@@ -33,11 +44,9 @@ class MeatTest(unittest.TestCase):
         selected=[8*64+8,8*64+40,20*64+20]
         self.assertEqual(self.save(selected)['status'],200)
         path=self.root/'A_meat.png';b=path.read_bytes()
-        self.assertEqual(struct.unpack('>IIBBBBB',b[16:29]),(64,64,8,0,0,0,0))
-        n=struct.unpack('>I',b[33:37])[0];raw=zlib.decompress(b[41:41+n])
-        pixels=b''.join(raw[y*65+1:y*65+65] for y in range(64))
-        self.assertEqual([i for i,x in enumerate(pixels) if x==255],selected)
-        self.assertEqual(set(pixels),{0,255})
+        pixels=decode_rgba(b)
+        self.assertEqual([i for i in range(4096) if pixels[i*4]==255],selected)
+        self.assertEqual(pixels[3::4],bytes(x*255 for x in base64.b64decode(self.load()['valid'])))
         for f,data in old.items():self.assertEqual((self.root/f).read_bytes(),data)
         fresh=Dataset(self.root);self.assertEqual(fresh.meat.load(self.key)['selected'],selected)
         self.assertEqual(fresh.state()['items'][0]['meat_status'],'saved')
@@ -60,7 +69,7 @@ class MeatTest(unittest.TestCase):
         self.assertEqual(self.load()['meat_status'],'stale')
         self.assertEqual(self.load()['selected'],[])
         self.save([521]);archives=list((self.root/'.meat_history').rglob('A_meat.png'))
-        self.assertEqual(len(archives),1);self.assertEqual(archives[0].read_bytes(),encode_mask([520]))
+        self.assertEqual(len(archives),1);self.assertEqual(decode_rgba(archives[0].read_bytes())[520*4:520*4+4],b'\xff'*4)
 
     def test_only_current_perfect_and_repair_preferred(self):
         self.ds.choose(self.key,'A_result.png',self.load()['revision'])
@@ -68,7 +77,7 @@ class MeatTest(unittest.TestCase):
         repair=skin_png(b'\x88\x33\x11\xff')
         self.ds.save_annotation(self.key,self.ds.state()['items'][0]['revision'],'repair','A_result.png','data:image/png;base64,'+base64.b64encode(repair).decode())
         loaded=self.load();self.assertEqual(loaded['skin_file'],'A_perfect.png')
-        self.assertEqual(base64.b64decode(loaded['rgba']),b'\x88\x33\x11\xff'*4096)
+        self.assertEqual(base64.b64decode(loaded['rgba'])[520*4:520*4+4],b'\x88\x33\x11\xff')
 
     def test_failed_metadata_write_restores_previous_mask(self):
         self.save([520]);old={p.name:p.read_bytes() for p in self.root.iterdir() if p.is_file()}
@@ -88,8 +97,27 @@ class MeatTest(unittest.TestCase):
         (self.root/'A_result.png').write_bytes(skin_png(b'\x10\x80\x40\0'))
         self.assertEqual(self.save([520])['status'],400)
 
+    def test_legacy_migration_archive_idempotence_and_fully_hidden_rejection(self):
+        from migrate_meat_visibility import migrate
+        from meat_annotations import digest
+        from uv_visibility import POLICY, SCHEMA
+        # Full opaque shell hides all inner cells, including a legacy positive.
+        skin=plain_skin_png();(self.root/'A_result.png').write_bytes(skin)
+        selected=[520,552];png=encode_mask(selected)
+        meta=dict(schema='mc-meat-v1',complete=True,id='A',skin_file='A_result.png',skin_sha256=digest(skin),
+                  mask_sha256=digest(png),model='classic',selected=selected,selected_count=2)
+        (self.root/'A_meat.png').write_bytes(png);(self.root/'A_meat.json').write_text(json.dumps(meta))
+        dry=migrate(self.ds);self.assertEqual(dry['totals']['removed_meat'],1)
+        self.assertEqual((self.root/'A_meat.png').read_bytes(),png)
+        report=migrate(self.ds,True);self.assertEqual(report['totals']['occluded_cells'],1632)
+        self.assertEqual(self.load()['selected'],[552]);self.assertEqual(self.save([520])['status'],400)
+        self.assertEqual((self.root/'A_result.png').read_bytes(),skin)
+        self.assertEqual((Path(report['rows'][0]['backup'])/'A_meat.png').read_bytes(),png)
+        self.assertEqual(decode_rgba((self.root/'A_meat.png').read_bytes())[520*4:520*4+4],b'\0'*4)
+        again=migrate(self.ds,True);self.assertEqual(len(again['rows']),0);self.assertEqual(len(again['skipped']),1)
+
     def test_layout_and_png_filters(self):
-        rgba=decode_rgba(skin_png());parts,valid,model=skin_parts(rgba)
+        rgba=decode_rgba(plain_skin_png());parts,valid,model=skin_parts(rgba)
         self.assertEqual(model,'classic');self.assertEqual(sum(valid),3264)
         self.assertEqual(len(parts),12)
         # Every selected coordinate has exactly one body part/layer owner.
@@ -100,7 +128,7 @@ class MeatTest(unittest.TestCase):
                     for x in range(u,u+w):owners[y*64+x]=owners.get(y*64+x,0)+1
         self.assertEqual(set(owners.values()),{1})
         for filt in range(5):
-            original=bytearray(skin_png());color=b'\x10\x80\x40\xff';row=color*64
+            original=bytearray(plain_skin_png());color=b'\x10\x80\x40\xff';row=color*64
             raw=bytearray()
             for y in range(64):
                 raw.append(filt)

best_annotator/test_meat_model.py

@@ -7,7 +7,7 @@ from unittest.mock import patch
 
 from app import Dataset, ReviewError
 from meat_model import MeatModel
-from test_perfect import skin_png
+from test_meat import skin_png
 
 
 class ModelBridgeTests(unittest.TestCase):

best_annotator/test_visibility.py

@@ -0,0 +1,66 @@
+import unittest
+from meat_annotations import skin_parts,decode_rgba
+from uv_visibility import visible_skin,axis_cover,annotation_mask
+
+
+class VisibilityTests(unittest.TestCase):
+    def skin(self,slim=False):
+        raw=bytearray([130,90,65,255]*4096)
+        if slim:raw[(20*64+55)*4+3]=0
+        parts,occupied,model=skin_parts(bytes(raw))
+        for p in parts:
+            if p['layer']:
+                for u,v,w,h,*_ in p['faces'].values():
+                    for y in range(v,v+h):
+                        for x in range(u,u+w):raw[(y*64+x)*4+3]=0
+        return raw,parts
+    def evaluate(self,raw,parts):
+        _,occupied,_=skin_parts(raw)
+        return visible_skin(raw,parts,occupied)
+    def test_empty_and_full_shells_all_faces_classic_slim(self):
+        for slim in [False,True]:
+            a,parts=self.skin(slim);shown,valid,hidden=self.evaluate(a,parts)
+            self.assertEqual(sum(hidden),0)
+            inner_count=sum(valid)
+            for p in parts:
+                if p['layer']:
+                    for u,v,w,h,*_ in p['faces'].values():
+                        for y in range(v,v+h):
+                            for x in range(u,u+w):a[(y*64+x)*4+3]=255
+            shown,valid,hidden=self.evaluate(a,parts)
+            self.assertEqual(sum(hidden),inner_count)
+            self.assertEqual(sum(valid),inner_count)
+            for i,hide in enumerate(hidden):
+                if hide:self.assertEqual(shown[i*4:i*4+4],b'\0'*4)
+    def test_partial_projection_and_alpha_not_covered(self):
+        a,parts=self.skin();inner=8*64+8;outer=8*64+40
+        a[outer*4+3]=255
+        _,v,h=self.evaluate(a,parts)
+        self.assertTrue(v[inner]);self.assertFalse(h[inner]) # corresponding UV alone insufficient
+        for y in [8,9]:
+            for x in [40,41]:a[(y*64+x)*4+3]=255
+        _,v,h=self.evaluate(a,parts);self.assertTrue(h[inner]);self.assertFalse(v[inner])
+        a[(9*64+41)*4+3]=254
+        _,v,h=self.evaluate(a,parts);self.assertTrue(v[inner]);self.assertFalse(h[inner])
+    def test_other_parts_never_exclude_head(self):
+        a,parts=self.skin()
+        for p in parts:
+            if p['layer'] and p['name']!='head':
+                for u,v,w,h,*_ in p['faces'].values():
+                    for y in range(v,v+h):
+                        for x in range(u,u+w):a[(y*64+x)*4+3]=255
+        _,v,h=self.evaluate(a,parts);self.assertTrue(v[8*64+8]);self.assertFalse(h[8*64+8])
+    def test_projection_symmetry_and_cell_centers_not_sufficient(self):
+        for n,e in [(8,1),(4,.5),(12,.5),(3,.5)]:
+            c=axis_cover(n,e)
+            self.assertTrue(all(len(x)>0 for x in c))
+            for i in range(n):self.assertEqual(c[n-1-i],tuple(n-1-j for j in reversed(c[i])))
+    def test_mask_transparency_ignores_cells_not_negative(self):
+        a,parts=self.skin();_,v,_=self.evaluate(a,parts)
+        p=decode_rgba(annotation_mask([520],v))
+        self.assertEqual(p[520*4:520*4+4],b'\xff'*4)
+        self.assertEqual(p[521*4:521*4+4],b'\0\0\0\xff')
+        self.assertEqual(p[:4],b'\0'*4)
+        with self.assertRaises(AssertionError):annotation_mask([0],v)
+
+if __name__=='__main__':unittest.main()

best_annotator/uv_visibility.py

@@ -0,0 +1,65 @@
+"""Exact face-normal orthographic coverage, independent of RGB and labels.
+
+Only the same body's outward outer face can exclude an inner texel. Another
+limb occluding it in one pose is not permanent occlusion. Each inner rectangle
+must be fully covered by the union of alpha=255 outer rectangles. Positive-area
+slivers count as visible. Shell enlargement matches skin_parts / Three.js.
+"""
+from fractions import Fraction
+from functools import lru_cache
+import struct
+import zlib
+
+POLICY = 'same-part-face-orthographic-full-opaque-v1'
+SCHEMA = 'mc-meat-v2'
+
+
+@lru_cache(maxsize=32)
+def axis_cover(count, inflate):
+    n=Fraction(count); extra=Fraction(str(inflate))
+    inner=[Fraction(k)-n/2 for k in range(count+1)]
+    outer=[(Fraction(k)/n-Fraction(1,2))*(n+extra) for k in range(count+1)]
+    return tuple(tuple(j for j in range(count)
+                       if max(inner[i],outer[j]) < min(inner[i+1],outer[j+1]))
+                 for i in range(count))
+
+
+def visible_skin(rgba, parts, occupied):
+    """Return cleared RGBA, trainable cells and full-occlusion flags (4096 bytes)."""
+    assert len(rgba)==16384 and len(occupied)==4096
+    hidden=bytearray(4096)
+    outer={p['name']:p for p in parts if p['layer']==1}
+    for p in parts:
+        if p['layer']!=0:continue
+        shell=outer[p['name']]
+        for face,(u,v,w,h,*flags) in p['faces'].items():
+            ou,ov,ow,oh,*oflags=shell['faces'][face]
+            assert (w,h,flags)==(ow,oh,oflags), 'Inner/outer face conventions differ'
+            xs=axis_cover(w,shell['inflate']);ys=axis_cover(h,shell['inflate'])
+            for y in range(h):
+                for x in range(w):
+                    i=(v+y)*64+u+x
+                    if occupied[i] and all(rgba[((ov+oy)*64+ou+ox)*4+3]==255
+                                           for oy in ys[y] for ox in xs[x]):hidden[i]=1
+    valid=bytes(int(bool(a) and not b) for a,b in zip(occupied,hidden))
+    out=bytearray(rgba)
+    for i,ok in enumerate(valid):
+        if not ok:out[i*4:i*4+4]=b'\0'*4
+    return bytes(out),valid,bytes(hidden)
+
+
+def encode_rgba(rgba):
+    assert len(rgba)==16384
+    def chunk(tag,data):
+        return struct.pack('>I',len(data))+tag+data+struct.pack('>I',zlib.crc32(tag+data))
+    raw=b''.join(b'\0'+rgba[y*256:(y+1)*256] for y in range(64))
+    return b'\x89PNG\r\n\x1a\n'+chunk(b'IHDR',struct.pack('>IIBBBBB',64,64,8,6,0,0,0))+chunk(b'IDAT',zlib.compress(raw))+chunk(b'IEND',b'')
+
+
+def annotation_mask(selected,valid):
+    selected=set(selected)
+    assert len(valid)==4096 and all(type(i) is int and 0<=i<4096 and valid[i] for i in selected)
+    raw=bytearray(16384)
+    for i,ok in enumerate(valid):
+        if ok:raw[i*4:i*4+4]=bytes([255 if i in selected else 0]*3+[255])
+    return encode_rgba(raw)