fix: fix render of graphics

xile611 · xile611 · commit 48d35c266400 · 2026-01-14T19:00:37.000+08:00
diff --git a/packages/vrender-core/src/register-modules.ts b/packages/vrender-core/src/register-modules.ts
@@ -120,18 +120,6 @@ export function registerRenderContributions() {
   serviceRegistry.registerSingleton(GroupRender, groupRender);
   contributionRegistry.register(GraphicRender, groupRender);
 
-  // 基础图形渲染器
-  contributionRegistry.register(GraphicRender, new DefaultCanvasRectRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasCircleRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasArcRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasLineRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasAreaRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasPathRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasTextRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasSymbolRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasPolygonRender());
-  contributionRegistry.register(GraphicRender, new DefaultCanvasImageRender());
-
   // DrawItemInterceptor
   const commonInterceptor = new CommonDrawItemInterceptorContribution();
   contributionRegistry.register(DrawItemInterceptor, commonInterceptor);
diff --git a/packages/vrender-core/src/render/contributions/render/index.ts b/packages/vrender-core/src/render/contributions/render/index.ts
@@ -1,15 +1,21 @@
 export * from './arc-render';
+export * from './arc3d-render';
+export * from './area-render';
 export * from './circle-render';
+export * from './group-render';
+export * from './glyph-render';
+export * from './image-render';
 export * from './line-render';
-export * from './area-render';
 export * from './path-render';
+export * from './polygon-render';
+export * from './pyramid3d-render';
 export * from './rect-render';
+export * from './rect3d-render';
+export * from './richtext-render';
+export * from './star-render';
 export * from './symbol-render';
 export * from './text-render';
 export * from './graphic-render';
-export * from './polygon-render';
-export * from './group-render';
-export * from './image-render';
 export * from './symbol';
 export * from './contributions';
 export * from './utils';
diff --git a/packages/vrender-kits/src/register/register-arc.ts b/packages/vrender-kits/src/register/register-arc.ts
@@ -1,4 +1,9 @@
-import { registerArcGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasArcRender,
+  GraphicRender,
+  registerArcGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasArcPicker } from '../picker/contributions/canvas-picker/arc-module';
 import { registerMathArcPicker } from '../picker/contributions/math-picker/arc-module';
@@ -9,11 +14,14 @@ export function _registerArc() {
   }
   _registerArc.__loaded = true;
   registerArcGraphic();
+
   if (browser) {
     registerCanvasArcPicker();
   } else {
     registerMathArcPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasArcRender());
 }
 
 _registerArc.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-arc3d.ts b/packages/vrender-kits/src/register/register-arc3d.ts
@@ -1,4 +1,11 @@
-import { registerArc3dGraphic, registerDirectionalLight, registerOrthoCamera } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasArc3DRender,
+  GraphicRender,
+  registerArc3dGraphic,
+  registerDirectionalLight,
+  registerOrthoCamera
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasArc3dPicker } from '../picker/contributions/canvas-picker/arc3d-module';
 
@@ -10,10 +17,11 @@ function _registerArc3d() {
   registerArc3dGraphic();
   registerDirectionalLight();
   registerOrthoCamera();
-  // arc3d renderer registered via core; no /* removed container */ usage
   if (browser) {
     registerCanvasArc3dPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasArc3DRender());
 }
 
 _registerArc3d.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-area.ts b/packages/vrender-kits/src/register/register-area.ts
@@ -1,4 +1,9 @@
-import { registerAreaGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasAreaRender,
+  GraphicRender,
+  registerAreaGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasAreaPicker } from '../picker/contributions/canvas-picker/area-module';
 import { registerMathAreaPicker } from '../picker/contributions/math-picker/area-module';
@@ -9,12 +14,13 @@ function _registerArea() {
   }
   _registerArea.__loaded = true;
   registerAreaGraphic();
-  // area renderer registered via core; no container usage
   if (browser) {
     registerCanvasAreaPicker();
   } else {
     registerMathAreaPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasAreaRender());
 }
 
 _registerArea.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-circle.ts b/packages/vrender-kits/src/register/register-circle.ts
@@ -1,4 +1,9 @@
-import { registerCircleGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasCircleRender,
+  GraphicRender,
+  registerCircleGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasCirclePicker } from '../picker/contributions/canvas-picker/circle-module';
 import { registerMathCirclePicker } from '../picker/contributions/math-picker/circle-module';
@@ -9,12 +14,13 @@ function _registerCircle() {
   }
   _registerCircle.__loaded = true;
   registerCircleGraphic();
-  // circle renderer registered via core; no container usage
   if (browser) {
     registerCanvasCirclePicker();
   } else {
     registerMathCirclePicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasCircleRender());
 }
 
 _registerCircle.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-glyph.ts b/packages/vrender-kits/src/register/register-glyph.ts
@@ -1,4 +1,9 @@
-import { registerGlyphGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasGlyphRender,
+  GraphicRender,
+  registerGlyphGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasGlyphPicker } from '../picker/contributions/canvas-picker/glyph-module';
 import { registerMathGlyphPicker } from '../picker/contributions/math-picker/glyph-module';
@@ -9,12 +14,13 @@ function _registerGlyph() {
   }
   _registerGlyph.__loaded = true;
   registerGlyphGraphic();
-  // glyph renderer registered via core; no container usage
   if (browser) {
     registerCanvasGlyphPicker();
   } else {
     registerMathGlyphPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasGlyphRender());
 }
 
 _registerGlyph.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-group.ts b/packages/vrender-kits/src/register/register-group.ts
@@ -1,11 +1,18 @@
-import { registerGroupGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasGroupRender,
+  GraphicRender,
+  registerGroupGraphic
+} from '@visactor/vrender-core';
 
 function _registerGroup() {
   if (_registerGroup.__loaded) {
     return;
   }
   _registerGroup.__loaded = true;
   registerGroupGraphic();
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasGroupRender());
 }
 
 _registerGroup.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-image.ts b/packages/vrender-kits/src/register/register-image.ts
@@ -1,4 +1,9 @@
-import { registerImageGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasImageRender,
+  GraphicRender,
+  registerImageGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasImagePicker } from '../picker/contributions/canvas-picker/image-module';
 import { registerMathImagePicker } from '../picker/contributions/math-picker/image-module';
@@ -9,12 +14,13 @@ function _registerImage() {
   }
   _registerImage.__loaded = true;
   registerImageGraphic();
-  // image renderer registered via core; no /* removed container */ usage
   if (browser) {
     registerCanvasImagePicker();
   } else {
     registerMathImagePicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasImageRender());
 }
 
 _registerImage.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-line.ts b/packages/vrender-kits/src/register/register-line.ts
@@ -1,4 +1,9 @@
-import { registerLineGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasLineRender,
+  GraphicRender,
+  registerLineGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasLinePicker } from '../picker/contributions/canvas-picker/line-module';
 import { registerMathLinePicker } from '../picker/contributions/math-picker/line-module';
@@ -14,6 +19,8 @@ function _registerLine() {
   } else {
     registerMathLinePicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasLineRender());
 }
 
 _registerLine.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-path.ts b/packages/vrender-kits/src/register/register-path.ts
@@ -1,4 +1,9 @@
-import { registerPathGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasPathRender,
+  GraphicRender,
+  registerPathGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasPathPicker } from '../picker/contributions/canvas-picker/path-module';
 import { registerMathPathPicker } from '../picker/contributions/math-picker/path-module';
@@ -9,12 +14,13 @@ function _registerPath() {
   }
   _registerPath.__loaded = true;
   registerPathGraphic();
-  // path renderer registered via core; no container usage
   if (browser) {
     registerCanvasPathPicker();
   } else {
     registerMathPathPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasPathRender());
 }
 
 _registerPath.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-polygon.ts b/packages/vrender-kits/src/register/register-polygon.ts
@@ -1,4 +1,9 @@
-import { registerPolygonGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasPolygonRender,
+  GraphicRender,
+  registerPolygonGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasPolygonPicker } from '../picker/contributions/canvas-picker/polygon-module';
 import { registerMathPolygonPicker } from '../picker/contributions/math-picker/polygon-module';
@@ -9,12 +14,13 @@ function _registerPolygon() {
   }
   _registerPolygon.__loaded = true;
   registerPolygonGraphic();
-  // polygon renderer registered via core; no container usage
   if (browser) {
     registerCanvasPolygonPicker();
   } else {
     registerMathPolygonPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasPolygonRender());
 }
 
 _registerPolygon.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-pyramid3d.ts b/packages/vrender-kits/src/register/register-pyramid3d.ts
@@ -1,4 +1,11 @@
-import { registerDirectionalLight, registerOrthoCamera, registerPyramid3dGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasPyramid3dRender,
+  GraphicRender,
+  registerDirectionalLight,
+  registerOrthoCamera,
+  registerPyramid3dGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasPyramid3dPicker } from '../picker/contributions/canvas-picker/pyramid3d-module';
 
@@ -10,10 +17,11 @@ function _registerPyramid3d() {
   registerPyramid3dGraphic();
   registerDirectionalLight();
   registerOrthoCamera();
-  // pyramid3d renderer registered via core; no /* removed container */ usage
   if (browser) {
     registerCanvasPyramid3dPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasPyramid3dRender());
 }
 
 _registerPyramid3d.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-rect.ts b/packages/vrender-kits/src/register/register-rect.ts
@@ -1,4 +1,9 @@
-import { registerRectGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasRectRender,
+  GraphicRender,
+  registerRectGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasRectPicker } from '../picker/contributions/canvas-picker/rect-module';
 import { registerMathRectPicker } from '../picker/contributions/math-picker/rect-module';
@@ -9,12 +14,13 @@ function _registerRect() {
   }
   _registerRect.__loaded = true;
   registerRectGraphic();
-  // rect renderer registered via core; no container usage
   if (browser) {
     registerCanvasRectPicker();
   } else {
     registerMathRectPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasRectRender());
 }
 
 _registerRect.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-rect3d.ts b/packages/vrender-kits/src/register/register-rect3d.ts
@@ -1,4 +1,9 @@
-import { registerRect3dGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasRect3dRender,
+  GraphicRender,
+  registerRect3dGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasRect3dPicker } from '../picker/contributions/canvas-picker/rect3d-module';
 
@@ -8,10 +13,11 @@ function _registerRect3d() {
   }
   _registerRect3d.__loaded = true;
   registerRect3dGraphic();
-  // rect3d renderer registered via core; no /* removed container */ usage
   if (browser) {
     registerCanvasRect3dPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasRect3dRender());
 }
 
 _registerRect3d.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-richtext.ts b/packages/vrender-kits/src/register/register-richtext.ts
@@ -1,4 +1,9 @@
-import { registerRichtextGraphic } from '@visactor/vrender-core';
+import {
+  contributionRegistry,
+  DefaultCanvasRichTextRender,
+  GraphicRender,
+  registerRichtextGraphic
+} from '@visactor/vrender-core';
 import { browser } from './env';
 import { registerCanvasRichtextPicker } from '../picker/contributions/canvas-picker/richtext-module';
 import { registerMathRichTextPicker } from '../picker/contributions/math-picker/richtext-module';
@@ -9,12 +14,13 @@ function _registerRichtext() {
   }
   _registerRichtext.__loaded = true;
   registerRichtextGraphic();
-  // richtext renderer registered via core; no container usage
   if (browser) {
     registerCanvasRichtextPicker();
   } else {
     registerMathRichTextPicker();
   }
+
+  contributionRegistry.register(GraphicRender, new DefaultCanvasRichTextRender());
 }
 
 _registerRichtext.__loaded = false;
diff --git a/packages/vrender-kits/src/register/register-star.ts b/packages/vrender-kits/src/register/register-star.ts
diff --git a/packages/vrender-kits/src/register/register-symbol.ts b/packages/vrender-kits/src/register/register-symbol.ts
diff --git a/packages/vrender-kits/src/register/register-text.ts b/packages/vrender-kits/src/register/register-text.ts
