mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-16 04:11:13 +00:00
ExPikaPaka
7bce53a773
Three files conflicted, all in the texture displacement subsystem that main has been working on in parallel. apply_uv_transform and UVTransform gained main's normalized_uv parameter for TextureProjectionMethod::ModelUV. A normalized uv has no millimetre tile to divide by, so the extents are skipped for it, but the mirroring still applies: a mirror is a placement choice and means the same thing on a model's own UV layout as on a projected one. The aspect correction stays skipped, as main has it. adjust_tangent_basis now calls main's box_projection_axes instead of restating the dominant-axis choice, which also picks up main's fix to the texture's orientation. The gizmo derives its whole frame from that basis, so it follows the new conventions without needing to know about them. The basic settings rows took main's float_row, which carries the tooltip and its media as arguments, and its disabling of tile size under ModelUV. The square lock and the second extent join that disabled block, being the same millimetres from another angle. Layers now persist to the .3mf as JSON, which they did not when this branch started, so tiling_scale_v, mirror_u and mirror_v are written and read there too. The reader keeps the default for a missing key, so a project written before the tile could be rectangular or mirrored still loads as a square, unmirrored one.