Free, open-source 3D sculpting for Linux, macOS and Windows: dense meshes, remeshing, painting, built-in AI (image/text to 3D), Send to Unreal, game-ready LODs, Gaussian splats and OpenUSD.
C++ 3d3d-sculptingcppdear-imguidigital-sculptingfbxgame-developmentgaussian-splattinggltfimage-to-3dmcpopenglopenusdsculptingtext-to-3dunreal-engine
Merge feat/polygroups: polygroups and visibility
islandmeda6fe5ea5f05a
diff --cc CMakeLists.txtindex 6d3ff221,697e6a24..ec8ec752--- a/CMakeLists.txt+++ b/CMakeLists.txt@@@ -104,7 -104,7 +105,8 @@@ if(SCULPTFORGE_BUILD_APPsrc/app/main.cppsrc/app/App.cppsrc/app/Demo.cpp+ src/app/PanelMasking.cpp+ src/app/PanelPolygroups.cppsrc/render/GL.cppsrc/render/Camera.cppsrc/render/Renderer.cppdiff --cc src/app/App.cppindex aadb467b,f889c6fc..d68ddee8--- a/src/app/App.cpp+++ b/src/app/App.cpp@@@ -459,16 -459,10 +459,17 @@@ void App::onMouseDown(float x, float yconst SDL_Keymod mod = SDL_GetModState();doc_.syncBvh();if (button == SDL_BUTTON_LEFT) {+ if (polygroupMouseDown(x, y, mod)) return;RayHit hit;+ const bool maskMod = ctrlDown(mod) && !(mod & SDL_KMOD_SHIFT);if (previewLod_ < 0 && pick(x, y, hit)) {- beginStroke(x, y, hit);+ if (maskMod) beginMaskStroke(x, y);+ else beginStroke(x, y, hit);+ } else if (maskMod && !(mod & SDL_KMOD_ALT) && previewLod_ < 0) {+ drag_ = Drag::MaskCanvas; // click inverts, drag clears (or zooms without a mask)+ maskCanvasX_ = x;+ maskCanvasY_ = y;+ maskCanvasMoved_ = false;} else {// Dragging on empty space navigates (ZBrush style).drag_ = (mod & SDL_KMOD_ALT) ? Drag::Pan : ctrlDown(mod) ? Drag::Zoom : Drag::Orbit;@@@ -497,8 -490,8 +498,9 @@@ void App::onMouseMove(float x, float y}void App::onMouseUp() {+ if (hideRectActive_) polygroupMouseUp();if (drag_ == Drag::Stroke) endStroke();+ if (drag_ == Drag::MaskCanvas) maskCanvasRelease();drag_ = Drag::None;}@@@ -881,11 -869,11 +884,15 @@@ void App::drawUi()"Smooth Hold Shift while sculpting\n""Rotate Left drag on background / right drag\n""Pan Alt + left drag background / middle drag\n"- "Zoom Mouse wheel / Ctrl + left drag background\n"+ "Zoom Mouse wheel / Ctrl + middle drag\n"+ " (Ctrl + left drag background when nothing is masked)\n"+ "Paint mask Hold Ctrl while stroking (Ctrl+Alt erases)\n"+ "Invert mask Ctrl + click background\n"+ "Clear mask Ctrl + drag background\n"+ "Isolate polygroup Ctrl+Shift+click (again: invert)\n"+ "Hide polygroup Ctrl+Shift+Alt+click\n"+ "Show all Ctrl+Shift+click background\n"+ "Hide outside rect Ctrl+Shift+drag (Alt: inside)\n""Brush size [ and ]\n""Brushes 1-8\n""Symmetry X X\n"diff --cc src/app/App.hindex 7d5b6267,2566b173..32bb1a1e--- a/src/app/App.h+++ b/src/app/App.h@@@ -230,19 -230,14 +230,27 @@@ privatestd::mutex pendingMutex_;std::vector<PendingFile> pendingFiles_;+ // Masking (PanelMasking.cpp): Ctrl strokes paint mask, Ctrl+Alt erases;+ // Ctrl+click on the background inverts it, Ctrl+drag there clears it.+ void drawMaskingSection();+ void beginMaskStroke(float x, float y);+ void maskCanvasMove(float x, float y);+ void maskCanvasRelease();+ bool strokeMask_ = false; // the current stroke edits the mask+ float maskStrength_ = 1.0f;+ int maskIterations_ = 1;+ float cavityThreshold_ = 0.02f;+ int maskGroup_ = 0;+ float maskCanvasX_ = 0.0f, maskCanvasY_ = 0.0f;+ bool maskCanvasMoved_ = false;+ // Polygroups & visibility (PanelPolygroups.cpp): Ctrl+Shift click/drag.+ bool polygroupMouseDown(float x, float y, SDL_Keymod mod); // true if it took the click+ void polygroupMouseUp();+ void drawPolygroupsSection();+ void drawPolygroupOverlay();+ bool hideRectActive_ = false;+ float hideRectX_ = 0.0f, hideRectY_ = 0.0f;+ float polygroupAngle_ = 30.0f;};} // namespace sfdiff --cc src/core/Commands.cppindex 8e099f57,eb76cb8d..1da4a791--- a/src/core/Commands.cpp+++ b/src/core/Commands.cpp@@@ -5,7 -5,7 +5,8 @@@#include "core/Decimate.h"#include "core/EnginePresets.h"#include "core/ImageTo3D.h"+#include "core/Masking.h"+ #include "core/Polygroups.h"#include "core/Primitives.h"#include "core/Splats.h"#include "core/Voxel.h"@@@ -598,7 -598,7 +599,8 @@@ CommandRegistry::CommandRegistry()return {true, s.str()};}});+ registerMaskingCommands(*this);+ registerPolygroupCommands(*this);}void CommandRegistry::add(Command cmd) { commands_.push_back(std::move(cmd)); }