Commit Graph
152 Commits
Author SHA1 Message Date
chasse20 7de078d8d9 Merge main and tidy mask-value shortcut tests 2026-11-10 07:15:02 -05:00
chasse20 368731f7a4 Fix Clippy checks and clean up affected functions 2026-11-10 05:33:20 -05:00
chasse20 a5f09109ea Merge main into PR 234 2026-11-10 05:33:20 -05:00
chasse20 3496930a87 Cancel active strokes when bake preview starts 2026-11-10 02:29:37 -05:00
chasse20 7e2b3c7e6a Move bake preview setup into the engine 2026-11-10 01:58:43 -05:00
chasse20 832a7f9e89 Fix live bake preview review findings 2026-11-10 01:34:02 -05:00
MistyMystery 0c1f66d1f5 Live bake preview: update for the bake refactor, share streamed map buffers, narrow the cancel guarantee
Merge upstream main into the branch. The streamed bake now returns the same Arc buffers it handed to the preview, and the document stores those, so a preview never holds a second copy of a map. A cancel leaves the set being baked as it was; sets that finished earlier stay applied.
2026-11-09 19:49:07 +04:00
chasse20 c573250601 Merge latest main into baked map import
Preserve both module and translation additions. Register the baked map tests in the consolidated integration suites.
2026-11-08 21:42:24 -05:00
chasse20 12eb4a45da Merge main and resolve color selection UI conflict 2026-11-08 20:25:00 -05:00
chasse20 4ed0d49a1c Move bake preview classification into the engine
Share visualization settings between scene shading and GPU sync, and use then_some for the conditional low-poly pass. Cover per-set distances, selected-set filtering, missing inputs and ownership with engine tests.
2026-11-08 19:13:06 -05:00
FredAppsandFredApps 4be75a2b11 test: bound hostile-input bake fixture to project resolution (#356)
Co-authored-by: FredApps <FredApps@users.noreply.github.com>
2026-11-08 12:55:22 +01:00
vangel76andClaude Opus 5.5 df86375a16 Merge upstream/main into fix/clippy-chunks-exact-to-as-chunks
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 12:18:59 +01:00
FredAppsandFredApps 117bfd5c1d ci: reduce integration test executables and skip unused tool install (#355)
Co-authored-by: FredApps <FredApps@users.noreply.github.com>
2026-11-08 11:34:56 +01:00
Chris Hassebrook 9aebba686b Fix color selection picking and inspection 2026-11-08 09:13:46 +00:00
Rebornim 433ae07387 Add color selection editor and ID map picking
Properties gets tolerance, a Colors list (swatch, R/G/B, re-pick, remove)
and a Pick color mode: the pointer becomes an eyedropper, both views show
the ID mesh map and the next click adds the ID color under it.
effect.set takes colors; effect.colorSelection.pick samples the texel the
mask evaluates and skips hidden texture sets.
2026-11-08 09:13:46 +00:00
Chris Hassebrook be989fba6f Harden baked map imports and fix TGA decoding 2026-11-08 08:58:07 +00:00
Chris Hassebrook 8e9ffe24ba Merge main and resolve UV stroke conflicts 2026-11-08 08:47:14 +00:00
Chris Hassebrook 13b2e77e76 Fix UV stroke anchors and pressure handling 2026-11-08 03:43:07 -05:00
Chris Hassebrook e729def8da Merge main and resolve translation conflicts 2026-11-08 07:59:02 +00:00
Chris Hassebrook b177ecc912 Merge pull request #323 from Rebornim/feat/polygon-fill-parity
Polygon fill: box selection, polygon mode, hit-test, visible polygons only and the 2D view
2026-11-08 02:49:29 -05:00
Chris Hassebrook e8145421c3 Fix curvature detail handling and merge main 2026-11-08 07:31:13 +00:00
Chris Hassebrook c87247c6d3 Fix polygon fill drag state and visibility 2026-11-08 02:23:39 -05:00
Chris Hassebrook b966d13da2 Fix filter picker visibility and swap error context 2026-11-08 01:42:22 -05:00
Rebornim cbe3c86acb Curvature detail: full-strength block borders, neutral raw curvature, stricter sizes
Divide each blurred detail size by the share of the blur window inside its
UV tile block, so texels near a block or map edge keep their strength
instead of fading toward zero. Raw mode reads mid gray when there is no
curvature to sample. The size cache keeps one layout per curvature map.
Mask previews of hidden layers build their sizes once before the tiles run
in parallel. effect.set rejects a sizes array with a non-numeric entry.
2026-11-08 01:38:20 +00:00
vangel76andClaude Opus 5.5 aecf9cd7ab Use as_chunks in the bake_tiles tests main added
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 02:29:28 +01:00
vangel76 d8ecfb7d42 Merge upstream/main into fix/clippy-chunks-exact-to-as-chunks 2026-11-08 02:27:35 +01:00
Rebornim c39d95b4c8 Filter swap: test that invalid parameters for the new filter are refused 2026-11-08 01:21:42 +00:00
Rebornim e2a69c4d12 Filter picker: Add filter opens the picker, same-id set edits in place
Add filter still adds a neutral HSL filter, and its slot now opens the
picker straight away; Esc keeps the HSL and one undo removes it.
effect.set naming the filter the effect already is edits its parameters
instead of rebuilding it from defaults. The picker's filter list is
worked out once. The slot cuts long names short between the thumbnail
and the caret, stays highlighted while its picker is open and shows an
outline while it has keyboard focus. More engine tests: a swap on a
mask, an explicit name, refused swaps leave no change and no undo step.
2026-11-08 01:15:26 +00:00
Rebornim a1d010ccb2 Curvature generators: mode and detail sizes
Curvature and edge wear generators read the baked curvature map one
texel at a time, so they only marked the sharpest edges. They now take a
mode (edges, cavities, both, raw) and seven detail size weights: the map
itself and the map blurred at 1 to 32 texels at 2K, padded past the UV
islands and built once per map and layout. Each size's edges and
cavities combine like a screen blend.

New curvature and edge wear generators use detail sizes. Generators saved
without them, and smart masks, read the map exactly as before.
2026-11-08 00:10:40 +00:00
Rebornim ca19e714a0 Filter picker: swap a filter's type from its Properties slot
effect.set takes filter: <id> to swap a filter effect's type in place,
keeping its place, blending, opacity and visibility (one undo step).
A reusable resource_picker shows grouped, searchable shelf tiles at a
slot; the filter slot uses it, and Add filter adds a neutral filter.
2026-11-08 00:09:49 +00:00
Rebornim 3836730030 X inverts the mask paint value while painting a mask
New command tool.swapMaskValue (mask value becomes 1 - value), default
shortcut X, enabled only while the selected layer's mask or one of its
mask effects is the paint target. Ctrl+X stays cut. Closes #332.
2026-11-07 12:26:07 +00:00
Rebornim 6eed52435d Match UV tiles per file, skip empty imports, review cleanups
- Each tiled file is keyed by its own tile number and its image passed to
  use_images, so tiles named differently or renamed on import still match
- Files of a tiled set without one of its tiles, and maps missing a tile, go
  to unmatched instead of failing the import
- Nothing to import leaves no undo step
- The map is read from the file name after the set name
- Toast counts maps; a failed import keeps the file list
- Cap the bytes one import reads; whole-method cleanup of set, use_images,
  tile_images and new_project
2026-11-07 09:14:41 +00:00
Rebornim ffe8587e54 Take &Path in the import test helper 2026-11-07 09:14:40 +00:00
Rebornim cfe837b86c Import baked maps when creating a project
New project > Advanced settings gets the project's normal map format and
Import baked maps: Add lists image files, and Create imports them with the
new textureSet.meshMap.import command, which sets each file as the mesh map
of the texture set and slot its name names (Body_ambient_occlusion.png,
Body_normal.1001.png) in one undo step and reports the files it left out.
2026-11-07 09:14:40 +00:00
Rebornim 695a3eed91 Shift+click paints straight lines in the 2D view
The 2D view keeps the end of the last finished stroke in texture coordinates,
with its texture set, so a line drawn after zooming or panning joins the same
texels, and previews the line while Shift is held, as the 3D view does. A
cancelled stroke (Escape) leaves the line start where it was.

Session::continue_stroke_uv stamps a long segment in batches of 4096 up to
1 << 17 stamps instead of stopping at 4096, keeps its carry within one step,
and seeds stamps from the stroke's running count (UvStrokeState) so noise
alphas don't repeat every pointer sample. The line preview is clipped to the
view, keeping its dash phase.

Refs #306
2026-11-07 08:22:27 +00:00
Rebornim 3b302b88dc Polygon fill: box selection, polygon mode, hit-test, visible polygons only and the 2D view
A drag in the 3D or 2D view draws a rectangle and fills what it selects
live; releasing it records one undo step. A click still fills one target,
now also in the 2D view. Fill modes gain Polygon (the source quad or n-gon,
from the importer's diagonals), and Mesh fills connected geometry. The
hit-test picks polygons the rectangle touches or whose center it holds;
visible polygons only uses a nearest-triangle buffer next to the eye-depth
raster, leaving hidden texture sets out.

Polygon fill's properties show its own settings and, by selection, the
material, the mask gray, or why it can't fill. Wireframes show while the
tool is active without changing the saved toggles.

Commands: tool.fillMode takes polygon, tool.fillSelection sets hitTest and
visibleOnly, and tool.click takes a screen box, a UV point or a UV box.
2026-11-07 07:00:12 +00:00
chasse20 747068dbdf Fix bake settings and UV tile controls 2026-11-05 22:39:42 -05:00
MistyMystery d60fb856c9 Live bake preview: the 3D view shows each mesh map as it finishes
A bake started in the app bakes the set's maps one after another (BakeTask::run_streaming, one bake per map, same pixels as a single bake) and streams each finished map from the worker thread. One map is installed per UI poll into the session's bake preview (not the document); the 3D view follows the newest map raw on the model, with maps and sets not baked yet shown neutral, and the bake bar names the stage. The bake bar picks Follow Newest Map, a finished map or Material. The previous view mode comes back when the bake ends, is cancelled or Bake mode is left; painting is paused while a bake is shown. bake.preview, ui.bake.start and ui.bake.cancel expose it on the control channel. New strings are translated in every shipped language.
2026-11-05 13:20:38 +04:00
chasse20 b978bc9525 Recover older project settings 2026-11-04 18:57:05 -05:00
vangel76andClaude Sonnet 5.5 81281c1a0a Merge upstream/main into fix/clippy-chunks-exact-to-as-chunks
Upstream removed bake/maps.rs, engine/tests/auto_rebake.rs and read_skew
(moved elsewhere); take the deletions. Convert two new chunks_exact uses in
bake/test/setting.rs.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-05 00:06:23 +01:00
chasse20 18a3c98176 Implement clean-room bake settings and improve map accuracy 2026-11-04 03:57:46 -05:00
chasse20 e4405760f1 Major refactor of Bake Mode settings and some UI, lots of cleanup for parity 2026-11-04 02:15:08 -05:00
vangel76andClaude Sonnet 5.5 715baf4760 Use as_chunks where the chunk size is a constant
Clippy 1.99 flags chunks_exact and chunks_exact_mut with a constant
chunk size (chunks_exact_to_as_chunks). Switch those call sites to
as_chunks / as_chunks_mut. Behaviour is unchanged: the trailing partial
chunk was already dropped.

Fixes #233

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-04 01:36:12 +01:00
chasse20 4e7f6f0114 Fix path fill symmetry culling 2026-11-03 00:57:31 -05:00
NetterSilverandClaude Haiku 5.5 1c657979d0 Apply brush symmetry to filled closed paths
Fixes #176

Co-Authored-By: Claude Haiku 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
2026-11-02 22:07:14 +01:00
bflatastic 15a06149d7 OBJ companions are named after the OBJ; the implicit material exports; ids are unique ignoring case 2026-11-02 19:43:54 +07:00
bflatastic 04af749194 Merge remote-tracking branch 'origin/main' into HEAD
# Conflicts:
#	ROADMAP.md
2026-11-02 19:28:51 +07:00
bflatastic 8dc6e533b7 UV-tiled sets take mesh maps from one image per tile 2026-11-02 18:57:37 +07:00
bflatastic 281b343c22 Merge remote-tracking branch 'origin/main' into export/obj-mtl 2026-11-02 18:46:47 +07:00
bflatastic 7f793fbf3a normalFormat: reject non-strings and non-image sources; a format-only edit keeps the channel's state; re-cooks keep the mark 2026-11-02 18:29:48 +07:00