Commit Graph
71 Commits
Author SHA1 Message Date
Rafael Mendes dce9f30c5a Add base-two and Cartesian function primitives 2026-11-04 23:25:13 -03:00
Rafael Mendes 698ea23380 Merge pull request #37 from storytold/feat/levels-histogram
Levels: histogram editor with range handles
2026-11-04 20:51:30 -03:00
Rafael Mendes e9f7547db6 Merge remote-tracking branch 'origin/main' into feat/levels-histogram 2026-11-04 20:39:28 -03:00
Dylan M. Taylor 2939420ef3 Update the lock file for MaterialCraft 0.1.2 2026-11-04 18:38:48 -05:00
Dylan M. Taylor 62bf83cf6b Fix the MaterialCraft 0.1.2 lock file 2026-11-04 18:34:24 -05:00
Rafael Mendes e409950dce Merge pull request #36 from storytold/feat/alpha-3d-and-wire-editing
Alpha in the 3D view; select, delete, swap and reroute wires
2026-11-04 20:31:22 -03:00
Dylan M. Taylor 36d20fc194 Restore Cargo.lock for the MaterialCraft 0.1.2 release 2026-11-04 18:29:39 -05:00
Dylan M. Taylor 31b13349e6 Release MaterialCraft 0.1.2 2026-11-04 18:22:06 -05:00
Rafael Mendes 2900eb1058 Merge branch 'feat/alpha-3d-and-wire-editing' into feat/levels-histogram
# Conflicts:
#	crates/ui-egui/tests/snapshot.rs
2026-11-04 20:14:36 -03:00
Rafael Mendes 6a249c66ff Merge remote-tracking branch 'origin/main' into feat/alpha-3d-and-wire-editing
# Conflicts:
#	README.md
2026-11-04 20:11:35 -03:00
Dylan M. Taylor 57c06be62a Release MaterialCraft 0.1.1 v0.1.1 2026-11-04 12:34:09 -05:00
Dylan M. Taylor ddb78274f9 Honor release version in packaging 2026-11-04 12:30:01 -05:00
Dylan M. Taylor 4e8bb9ca9a ci: add SonarCloud analysis 2026-11-04 09:47:53 -05:00
PiJellyPin 0a29b6d8c9 Merge pull request #51 from storytold/49-change-to-sbs-instead-of-mcraft
Load sbs files, and save them
2026-11-04 09:01:27 +01:00
PiJellyPin 66fdba878f Testing a bunch of stuff 2026-11-04 08:47:10 +01:00
PiJellyPin ef27065140 Merge branch '49-change-to-sbs-instead-of-mcraft' of https://github.com/storytold/materialcraft into 49-change-to-sbs-instead-of-mcraft 2026-11-04 08:37:25 +01:00
PiJellyPin 93cbec5622 Update .gitignore 2026-11-04 07:26:10 +01:00
Chris Hassebrook d62ca9ac53 Merge branch 'main' into 49-change-to-sbs-instead-of-mcraft 2026-11-04 01:11:49 -05:00
PiJellyPin 6310230ecd Load sbs files
save, load etc.. for sbs files
2026-11-04 07:03:54 +01:00
Zachary Aflalo c97f92abff Start desktop and browser sessions with an empty graph (#29) 2026-11-04 06:17:40 +01:00
Rafael MendesandClaude Opus 5.5 936b8a3b08 chore(levels): keep clear of the lines the wire and alpha PR edits
Move the Levels screenshot's ATTRIBUTION row, the README mention, the
architecture note and the snapshot scene to places #36 does not touch, so
the two pull requests merge in either order without conflicts. No change
in behavior; the snapshot scene now runs last.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 15:26:01 -03:00
Rafael MendesandClaude Opus 5.5 934c227774 feat(levels): histogram editor in the properties panel
Selecting a Levels node now shows a visual editor above its sliders: a
histogram of the node's input (256 bins; red, green and blue overlaid for a
color input; scaled to the tallest bin between pure black and white) with
the clipped ranges shaded and the levels transfer curve on top, draggable
input low/mid/high handles under it and output low/high handles under a
black-to-white bar.

Fixes in how Levels is edited: Level in mid is relative to the input range,
and its handle now sits where it acts and moves with the range; the input
low and high handles cannot cross. Parameters bound to inputs or driven by
functions keep their handles locked. Every drag is a graph.node.param
command, one undo step per handle. levels_fn no longer propagates NaN.

Tests cover the histogram, the handle constraints and the remap math; the
snapshots UI test renders the editor. Documented in docs/levels-editor.md.

Clean-room implementation.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 15:03:08 -03:00
Rafael MendesandClaude Opus 5.5 29dee321d9 feat(graph): select several wires and swap their sources with X
Shift+click adds a wire to the selection and Ctrl+click toggles it. With two
or more wires selected, X swaps where they come from: two wires trade
sources, more reverse them in target-node and input order, so selecting a
Blend node's foreground and background wires and pressing X swaps the two
layers. The wires stay selected, so X again swaps back. Delete and
Backspace remove every selected wire in one undo step, and the wire menu
gains Swap selected links and Delete selected links.

New commands graph.wire.swap and graph.wire.delete take
{wires: [{to, toPort}, ...]}; a swap that would make a cycle is refused and
changes nothing. Engine and UI tests (real clicks on a Blend node) cover
both; docs/wires-and-alpha.md documents the gestures, the ordering rule and
the commands.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 14:43:32 -03:00
Rafael MendesandClaude Opus 5.5 8f4dd5b6c1 feat: alpha in the 3D view; select, delete and reroute wires
3D view: the material's alpha (the Opacity output, else the Base color's
alpha channel) now makes the mesh see-through. Rays composite front to back
through up to eight transparent layers and back faces shade toward the
viewer, so the inside of a cut-out mesh and the environment show through.
view.3d takes `transparency` (default on) and `alphaView`; the Display menu
and a bottom-bar button toggle an unlit view of the alpha channel.

Graph editor: click a wire to select it (Delete or Backspace removes it),
drag a wire to pull a reroute Dot out of it, double-click a wire to drop a
Dot there, right-click a wire for Insert reroute dot and Delete link. The
new graph.wire.insertDot command splits a wire with a Dot in one undo step.

Docs: docs/wires-and-alpha.md (gestures, commands, rendering, tests) with
two snapshot screenshots, plus architecture, parity, control protocol,
README and ATTRIBUTION updates.

Clean-room implementation.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 14:32:48 -03:00
Brandon Thomas f1bb82e8e0 Merge pull request #26 from dylanmtaylor/feat/linux-signing
ci(release): sign the Linux packages with LINUX_SIGNING_KEY
2026-11-03 08:27:33 -05:00
Brandon ThomasandClaude Opus 5.5 71632d82ef ci(release): match the current Flatpak OCI scaffold
Signed bundles get no OCI update source until LINUX_OCI_SIGNATURES_READY
is set, and only a stable release-branch build moves the stable OCI tag,
as storytold/craft-common-actions' scaffold-flatpak-oci.sh now does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 08:27:28 -05:00
Dylan M. Taylor 4bbb15bc81 ci(release): sign the Linux packages with LINUX_SIGNING_KEY
Pass LINUX_SIGNING_KEY to the shared release workflow (storytold/craft-common-actions#129),
which signs the rpm, deb, Arch package, AppImage, tarballs, Flatpak OCI image and SHA256SUMS.txt,
and scaffold flatpak-bundle.sh so a release signs the Flatpak bundle's commit and embeds the key,
with the bundle's origin updating from the ArtCraft OCI repository.
2026-11-02 22:02:12 -05:00
PiJellyPin fc98b115f0 Merge pull request #24 from Belligerently/fix/tab-node-search
Allow Tab to open the graph node search
2026-11-03 03:02:46 +01:00
Belligerently f459e5674a Allow Tab to open graph node search 2026-11-02 20:38:21 -05:00
PiJellyPin 613d603b8f Merge pull request #21 from storytold/11-scaling-ui-lags-the-software
Fixed ui scaling lag
2026-11-03 01:42:10 +01:00
PiJellyPin 08546a3c06 Fixes 2026-11-03 01:30:15 +01:00
PiJellyPin 483e50f633 Merge pull request #19 from ljkx/3d-view-pan
3D view: pan the camera with Alt+drag or middle-drag
2026-11-03 00:54:40 +01:00
ljkx f8f8d8c2c0 3D view: make the pan limit and speed preferences
Review: no hardcoded limit. The two MAX_TARGET constants are gone.

- Engine: CameraPrefs { pan_limit, pan_speed } with the defaults in one
  place (Default: 5 mesh radii, speed 1), sanitized against NaN and
  negative values. Session::set_camera_prefs stores them and pulls the
  orbit target back inside a lowered limit; view.3d clamps targets to it;
  session.inspect shows it.
- App: Prefs.camera persists with the other preferences (older saved
  preferences load the defaults), apply_prefs pushes it into the session,
  and Edit > Preferences has "3D pan limit" and "3D pan speed" sliders.
  The drag uses the pan speed.
- Renderer: no limit of its own. camera() falls back to the scene center
  for a non-finite target and pan() returns the unbounded offset.
2026-11-03 00:28:44 +01:00
ljkx f786a2d4c3 3D view: pan the camera with Alt+drag or middle-drag
The 3D view could only orbit around the mesh center and zoom, so there was
no way to look at an off-center part of a mesh up close.

- View3d gains `target`, the orbit point's offset from the mesh center in
  mesh radii (world axes, so orbiting after a pan turns around the new
  point). `view.3d {target: [x, y, z]}` sets it, validated before anything
  changes and clamped to 5 radii; view.3d.reset clears it.
- The renderer orbits around the offset target, and `pan` turns a drag
  (in view heights) into a new target so the mesh follows the pointer.
- Alt+drag or middle-drag pans in the 3D view, like the graph. Double-click
  and the Camera presets recenter. The headless render honours the target.
2026-11-02 20:30:01 +01:00
Chris Hassebrook d97721cc67 Merge pull request #17 from storytold/5-panorama-node-hdr-samples
Panorama node hdr samples
2026-11-02 13:52:29 -05:00
Chris Hassebrook 6862aa91b4 Merge pull request #16 from storytold/4-full-sbs-sample
Initial sample SBS with all nodes from reference application
2026-11-02 13:49:42 -05:00
chasse20 fdbdbcd094 Remove redundant HDR license paragraph 2026-11-02 13:43:55 -05:00
chasse20 9f1b8de5b0 Add Poly Haven HDR maps with attribution and CC0 license 2026-11-02 13:40:13 -05:00
chasse20 1cda570daa Initial sample SBS with all nodes from reference application 2026-11-02 13:23:27 -05:00
Brandon Thomas cedabf0203 Merge pull request #3 from storytold/fix/freebsd-draft-checksums
Keep the checksum file out of its own list
v0.1.0
2026-11-02 02:54:26 -05:00
Brandon ThomasandClaude Opus 5.5 6c485cf3eb Keep the checksum file out of its own list
The FreeBSD draft step redirected into SHA256SUMS.txt before the glob expanded, so
the file listed itself with the hash of an empty file and sha256sum -c failed on it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 02:47:15 -05:00
Brandon Thomas b3c79c155e Merge pull request #2 from storytold/fix/script-exec-bits
Fix the release build: script permissions and FreeBSD on a private repo
2026-11-02 02:27:03 -05:00
bflatasticandClaude Opus 5.5 5b0deed36f Revert "Release: skip FreeBSD while the repo is private"
storytold/materialcraft#2 keeps FreeBSD by building it on a larger runner
instead; this skip conflicts with it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 14:15:12 +07:00
bflatasticandClaude Opus 5.5 1ab673e24b Release: skip FreeBSD while the repo is private
Private repos get 2-core/7 GB standard runners, which can't hold the 12 GB
FreeBSD VM, so the FreeBSD jobs failed and blocked the draft. Turn it back
on once the repo is public.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 14:14:00 +07:00
Brandon ThomasandClaude Opus 5.5 8e91074c68 Build FreeBSD on a larger runner while the repo is private
A private repo's ubuntu-latest has about 7 GB, and the shared workflows start a
12 GB FreeBSD VM, so QEMU fails at startup. The shared workflows have no runner
input, so release.yml turns off their FreeBSD job and runs its own copy on
github-ubuntu-16core, then adds the archives and checksums to the draft release.

freebsd.yml would fail the same way, so it is manual-only until the repo is
public.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 02:13:19 -05:00
bflatasticandClaude Opus 5.5 8bca1af9ff Mark the packaging scripts executable
The shared release workflow runs them directly, so without the executable bit the
Linux, macOS and Web release jobs stop with "Permission denied" (v0.1.0 run
41403401506).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 14:09:57 +07:00
Brandon ThomasandClaude Opus 5.5 90e9529d4b Mark the packaging scripts executable
The shared release workflow runs these scripts directly, and they were committed
as 100644, so the first release run failed with Permission denied. env.sh is
sourced, so it stays as it is.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 02:01:17 -05:00
bflatastic 87beddd424 Merge remote-tracking branch 'origin/main' 2026-11-02 13:26:38 +07:00
bflatasticandClaude Opus 5.5 e34b2b0597 App icon: the owner's engraved rhino on MaterialCraft teal
Vectorised with craftrules vectorize_tile.py at the shared Crafting Apps
settings (512 tile, rx=112, ink/paper/#178a9c), with every PNG, .ico and
.icns regenerated by packaging/icons.sh. The README shows the icon, and
the UI accent and web loader use the new teal.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 13:26:14 +07:00
BFlat 484260be20 Merge pull request #1 from storytold/feat/cross-app-materials
Cross-app materials: .mcmat portable materials for TextureCraft
2026-11-02 13:14:15 +07:00