A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
feat(editor): always-on collision overlay + Marker pin gizmos
yhhe0264e5be68f
diff --git a/desktop/src/engine/ViewportController.ts b/desktop/src/engine/ViewportController.tsindex 7c770553d..1f55a924b 100644--- a/desktop/src/engine/ViewportController.ts+++ b/desktop/src/engine/ViewportController.ts@@ -6,6 +6,7 @@ import {ParticleEmitter, OneWayPlatform,RevoluteJoint, DistanceJoint, PrismaticJoint, WeldJoint, WheelJoint, MotorJoint,UINode, UICameraInfo, screenToUiWorld, uiWorldToScreen, uiPickAllWorld, type UICameraData,+ Marker,TilemapLayer, TilemapAPI, decodeTilemapChunks, CHUNK_SIZE, tileCollisionOutlines,tileCellCenter, tileCellOutline, isNonOrthogonal,readColliderShapes, colliderShapeOutline, shapeCenter,@@ -648,6 +649,29 @@ export const ViewportController = {return { cx: center.x, cy: center.y, kind: l.type, color, radiusPx, sdx, sdy, coneHalf, on, handle: handle ?? null };},+ /** Ids of the scene's Marker (point-object) entities — the marker-pin gizmo set. A+ * Marker renders nothing, so it's drawn as an always-on pin at its position. */+ markerIds(): EntityId[] {+ const world = EngineHost.world;+ if (!world) return [];+ const out: EntityId[] = [];+ for (const e of world.getAllEntities()) {+ if (world.has(e, Marker) && world.has(e, Transform)) out.push(e);+ }+ return out;+ },++ /** Screen-space position of a Marker's pin (its Transform world position → canvas px),+ * and its `type` label, or null when off-camera/removed. */+ getMarkerGizmo(id: EntityId): { cx: number; cy: number; type: string } | null {+ const world = EngineHost.world;+ if (!world || !world.valid(id) || !world.has(id, Marker) || !world.has(id, Transform)) return null;+ const t = world.get(id, Transform);+ const m = world.get(id, Marker) as { type?: string };+ const p = this.worldToClient(t.worldPosition.x, t.worldPosition.y);+ return p ? { cx: p.x, cy: p.y, type: typeof m.type === 'string' ? m.type : '' } : null;+ },+/** Ids of entities carrying ANY collider (box/circle/capsule/segment/polygon/chain) —* the collider-gizmo set. All six render through the shared shape-outline projection. */colliderIds(): EntityId[] {diff --git a/desktop/src/panels/Viewport.tsx b/desktop/src/panels/Viewport.tsxindex 6c4122f15..7d1660dfc 100644--- a/desktop/src/panels/Viewport.tsx+++ b/desktop/src/panels/Viewport.tsx@@ -4,7 +4,7 @@ import { memo, useEffect, useMemo, useRef, useState, useSyncExternalStore } fromimport type { PointerEvent as ReactPointerEvent, DragEvent as ReactDragEvent, ReactNode } from 'react';import {MousePointer2, Move, RotateCw, Scale3d, Grid3x3, Frame,- Camera, Check, ChevronDown, Loader2, TriangleAlert, Lightbulb, Sparkles, Globe, Crosshair, Smartphone, Monitor, Magnet, Axis3d, Hexagon, type LucideIcon,+ Camera, Check, ChevronDown, Loader2, TriangleAlert, Lightbulb, Sparkles, Globe, Crosshair, Smartphone, Monitor, Magnet, Axis3d, Hexagon, MapPin, type LucideIcon,AlignStartVertical, AlignCenterVertical, AlignEndVertical,AlignStartHorizontal, AlignCenterHorizontal, AlignEndHorizontal,AlignHorizontalDistributeCenter, AlignVerticalDistributeCenter,@@ -19,7 +19,7 @@ import { useEditorMode } from '@/store/editorModeStore';import { RESOLUTION_PRESETS, RESOLUTION_PRESET_BY_ID, DESIGN_RESOLUTION_PRESETS, deviceDims } from '@/mode/resolutionPresets';import { buildStampGhost } from '@/tools/tileStampGhost';import { alignSelection, distributeSelection } from '@/tools/alignTools';-import { TilemapAPI, tileIdOf, isNonOrthogonal, UINode, DimensionUnit, computeEffectiveOrthoSize, type TileCollisionPiece, type TilesetModel } from 'esengine';+import { TilemapAPI, tileIdOf, isNonOrthogonal, isCollisionPaletteRef, buildCollisionPaletteModel, UINode, DimensionUnit, computeEffectiveOrthoSize, type TileCollisionPiece, type TilesetModel } from 'esengine';import { commands } from '@/commands';import { MOD_LABEL } from '@/commands/keybinding';import { EngineHost } from '@/engine/EngineHost';@@ -865,6 +865,14 @@ export function Viewport() {() => (engine.status === 'ready' ? ViewportController.light2DIds() : []),[structRev, engine.status],);+ // Marker (point-object) entities render nothing — draw each as an always-on pin at its+ // position (click to select), so spawn points / waypoints / triggers are visible without+ // being selected. Same per-frame rAF + structural id set as the camera/light gizmos.+ const markerRefs = useRef(new Map<number, HTMLDivElement | null>());+ const markerIds = useMemo(+ () => (engine.status === 'ready' ? ViewportController.markerIds() : []),+ [structRev, engine.status],+ );// Physics colliders aren't drawn by the renderer — outline each (box polygon /// circle) as a gizmo so you can see/tune collider shapes without entering Play.const colliderRefs = useRef(new Map<number, SVGSVGElement | null>());@@ -882,29 +890,55 @@ export function Viewport() {const tileColModelRef = useRef<{ key: string; model: TilesetModel | null }>({ key: '', model: null });useEffect(() => {const clear = () => { tileColPiecesRef.current = []; };- if (engine.status !== 'ready' || !showTileCollision || !tilemapSelected || primaryId == null) {+ if (engine.status !== 'ready' || !showTileCollision) {clear();tileColModelRef.current = { key: '', model: null };return;}- const refs = layerTilesetRefs(primaryId);- const key = refs.join('|');- const build = () => {- const model = tileColModelRef.current.model;- tileColPiecesRef.current = model ? ViewportController.tilemapColliderOutlines(primaryId, model) : [];+ // Collision (obstacle) layers ALWAYS contribute their outlines — the overlay IS their+ // content (they render nothing), so they stay visible unselected. They all share the+ // single built-in palette model (no per-layer disk load). A selected NON-collision+ // tilemap additionally shows its per-tile collision as a debug aid (selected-only).+ const collisionIds: number[] = [];+ for (const id of SceneModel.entityOrder()) {+ const e = SceneModel.entityBySource(id);+ if (e?.components.some((c) => c.type === 'TilemapLayer') && isCollisionPaletteRef(layerTilesetRefs(id))) {+ collisionIds.push(id);+ }+ }+ const paletteModel = collisionIds.length > 0 ? buildCollisionPaletteModel() : null;+ const selId = tilemapSelected && primaryId != null && !collisionIds.includes(primaryId) ? primaryId : null;++ const rebuild = () => {+ const pieces: TileCollisionPiece[] = [];+ if (paletteModel) {+ for (const id of collisionIds) pieces.push(...ViewportController.tilemapColliderOutlines(id, paletteModel));+ }+ if (selId != null && tileColModelRef.current.model) {+ pieces.push(...ViewportController.tilemapColliderOutlines(selId, tileColModelRef.current.model));+ }+ tileColPiecesRef.current = pieces;};- // Same tileset list as last time → reuse the cached model, just re-read the tiles.- if (tileColModelRef.current.key === key && tileColModelRef.current.model) { build(); return; }- // Tileset refs changed (or first show): reload the model, then build once it lands.++ // Collision layers render immediately (sync). A selected .estileset tilemap may need an+ // async model load; show the collision layers now and fold it in once its model lands.+ if (selId == null) {+ tileColModelRef.current = { key: '', model: null };+ rebuild();+ return;+ }+ const refs = layerTilesetRefs(selId);+ const key = refs.join('|');+ if (tileColModelRef.current.key === key && tileColModelRef.current.model) { rebuild(); return; }let alive = true;- clear();+ rebuild(); // collision layers appear at once; the selected layer joins on model loadvoid loadLayerTilesetModel(refs).then((model) => {if (!alive) return;tileColModelRef.current = { key, model };- build();+ rebuild();});return () => { alive = false; };- }, [engine.status, showTileCollision, tilemapSelected, primaryId, dataRev]);+ }, [engine.status, showTileCollision, tilemapSelected, primaryId, dataRev, structRev]);// Scene-authored joints are equally invisible — draw each as an anchor link (plus// axis/velocity direction). Keyed by entity + joint type; same physics show flag.@@ -1669,6 +1703,19 @@ export function Viewport() {}}+ // Marker pins — position each at its entity's world point (or hide it when the+ // marker is off-camera/removed). Same edit-mode + gizmos-on gate as the other icons.+ for (const [mid, wrap] of markerRefs.current) {+ if (!wrap) continue;+ const mg = camsOn ? ViewportController.getMarkerGizmo(mid) : null;+ if (mg) {+ wrap.style.visibility = 'visible';+ wrap.style.transform = `translate(${mg.cx}px, ${mg.cy}px)`;+ } else {+ wrap.style.visibility = 'hidden'; // an invisible pin must not swallow clicks+ }+ }+// Particle-emitter gizmos — a clickable icon at the emitter + its spawn-shape// outline (cone wedge / circle / box / point), so an otherwise-invisible emitter// is placeable and aimable in edit mode. Same edit-mode + gizmos-on gate.@@ -2218,6 +2265,34 @@ export function Viewport() {);})}+ {markerIds.map((id) => {+ const src = SceneModel.sourceFor(id);+ const name = src != null ? SceneModel.entityBySource(src)?.name : undefined;+ return (+ <div+ key={id}+ ref={(el) => {+ if (el) markerRefs.current.set(id, el);+ else markerRefs.current.delete(id);+ }}+ className="viewport__marker-gizmo"+ >+ <span+ className="viewport__marker-hit"+ role="button"+ title={name}+ onPointerDown={(e) => {+ if (e.button !== 0 || src == null) return;+ e.stopPropagation();+ useSelection.getState().select(src);+ }}+ >+ <MapPin className="viewport__marker-icon" size={16} strokeWidth={2} />+ </span>+ </div>+ );+ })}+{/* Tile-collision overlay: ONE viewport-spanning SVG for the selected layer's wholecollision (solid outlines + dashed sensors + one-way arrows). The rAF writes thecombined path data each frame; empty when the flag's off or no tilemap is picked. */}diff --git a/desktop/src/theme/app.css b/desktop/src/theme/app.cssindex 985f380a8..8cf205c05 100644--- a/desktop/src/theme/app.css+++ b/desktop/src/theme/app.css@@ -415,6 +415,37 @@ body.thumb-capture .viewport > :not(.viewport__stage):not(.viewport__play) {.viewport__light-hit:hover .viewport__light-icon {transform: scale(1.2);}+/* Marker pin — a point-object's always-on icon; the pin TIP (bottom-centre) sits on the+ entity position, and the icon is the select-to-identify click target. */+.viewport__marker-gizmo {+ position: absolute;+ left: 0;+ top: 0;+ z-index: 2;+ pointer-events: none;+ will-change: transform;+ color: var(--acc);+}+.viewport__marker-hit {+ position: absolute;+ left: 0;+ top: 0;+ margin: -22px 0 0 -11px;+ width: 22px;+ height: 24px;+ display: grid;+ place-items: end center;+ pointer-events: auto;+ cursor: pointer;+}+.viewport__marker-icon {+ display: block;+ filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.85));+ transition: transform var(--t-fast);+}+.viewport__marker-hit:hover .viewport__marker-icon {+ transform: scale(1.2);+}.viewport__light-svg {position: absolute;left: 0;diff --git a/desktop/src/theme/viewport.css b/desktop/src/theme/viewport.cssindex bfb5b9424..d4b7cbd27 100644--- a/desktop/src/theme/viewport.css+++ b/desktop/src/theme/viewport.css@@ -303,6 +303,7 @@.viewport--play .viewport__collider-gizmo,.viewport--play .viewport__tilecol-gizmo,.viewport--play .viewport__particle-gizmo,+.viewport--play .viewport__marker-gizmo,.viewport--play .viewport__toolbar,.viewport--play .viewport__minimap,.viewport--play .ov-left {