Commit Graph

28 Commits

Author SHA1 Message Date
0971ed4ca8 feat(experimental): merge OrcaSlicer-ImageMap fork (texture/image printing)
Merges sentientstardust-dev/OrcaSlicer-ImageMap onto v2.4.2 base.
Includes CMYK texture mapping, side-surface image printing, OBJ/GLTF
texture import, image projection, and prime tower image rendering.

ImageMap base: OrcaSlicer commit 2026-04-26 (between v2.4.1 and v2.4.2)
KX-specific patches (Moonraker/AMS, updater, profile) to be applied on top.

EXPERIMENTAL — not for production use.
2026-07-21 14:02:25 +02:00
da7e0540a9 ENABLE_SMOOTH_NORMALS (#14080)
* ENABLE_SMOOTH_NORMALS

* Remove definition of macro L if defined

* Update GLModel.cpp

* suavizado ajustado en 5 grados

5 grados

3,5 grados

* Ajuste de brillo menos intenso

* opcion smooth normals

Update GLModel.cpp

test

test 3

* cleaning macros

* tooltip

* Apply suggestion from @RF47

* Apply suggestion from @RF47

* Apply suggestions from code review

Co-authored-by: Rodrigo Faselli <162915171+RF47@users.noreply.github.com>
2026-06-19 10:46:57 +08:00
27d5ab6acb Don't render side raw offset atlas data on top surfaces and vice versa 2026-06-12 11:48:47 +01:00
cf8bb38dc6 Realistic View: Phong Shading + Ambient Oclusion + Cast Shadows (#13704)
* Phong Shading

* Add shader selection to graphics preferences

* SSAO

* 3D canvas menu

Co-Authored-By: yw4z <yw4z@outlook.com>

* better SSAO

* Adjust

* phong in preview mode

* cast shadows

sombra 3

sombra 2

* fix 1

* SSAO independent

* Fix 2

* clean 1

* shadows availables with gouraud

* Update Preferences.cpp

* tweeks

* No Normal textures

* Depth texture allocation

* avoid rebinding/redefining state each render.

* free SSAO

* set shadow fill color

* remove duplicated code

* cached model to avoid per-frame uploads

* yw4z suggestion

Co-Authored-By: yw4z <yw4z@outlook.com>

* Update Preferences.cpp

Co-Authored-By: yw4z <yw4z@outlook.com>

* Update GLCanvas3D.cpp

* only gouraud for preview mode

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* Add new OpenGL shading model setting

* Update src/slic3r/GUI/GLCanvas3D.cpp

* Apply suggestion from @RF47

* Title Case

* normal textures

* gamma 2.2

Co-Authored-By: Ian Bassi <12130714+ianalexis@users.noreply.github.com>

* Revert "gamma 2.2"

This reverts commit 909a84af604a080b3f4b8dd67d13956473a77afe.

* Reapply "gamma 2.2"

This reverts commit 0f0c3d9ec0d2c9647ce06afac4fe9266b5ffda97.

* AO blend

Co-Authored-By: Ian Bassi <12130714+ianalexis@users.noreply.github.com>

* Revert "AO blend"

This reverts commit c5c9a3aa6b295704e71299451b937648e5c5f109.

* 4.0 pixel radius

* windows light effect

direccion

brillo

* smoothing

* ajuste de brillo

* ajustes de brillo

* No SSAO  for bed

* disable realistic view on paint gismos

* Update ssao.fs

* circular panel

---------

Co-authored-by: yw4z <yw4z@outlook.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Ian Bassi <ian.bassi@outlook.com>
Co-authored-by: Ian Bassi <12130714+ianalexis@users.noreply.github.com>
Co-authored-by: SoftFever <softfeverever@gmail.com>
2026-06-04 18:22:06 +08:00
68460338d4 Don't show simulated color preview on lower surfaces unless they will be printed. Enable layer phase detail by default 2026-05-27 23:15:47 +01:00
1f3fe6d6a1 Add simulated color preview support for top-surface coloring. Make preview settings apply to every texture mapping zone 2026-05-27 20:07:01 +01:00
9e27af3032 Improvements to paint by color tool 2026-05-24 08:47:37 +01:00
d9e74f22f6 Add radial gradients 2026-05-23 17:52:03 +01:00
359693fa89 Improvements to linear gradient UI and serialization. Allow undo/redo for changes to gradient points. 2026-05-23 14:37:32 +01:00
8668114350 Add linear gradient mode 2026-05-23 10:24:26 +01:00
c6035a7c91 Update scene preview when 2D gradient settings are being changed 2026-05-22 09:19:00 +01:00
14e61db633 Render preview for 2D gradients in shader. Misc bugfixes.
- Make sure prime tower preview is updated when settings change
- Manage color data dialog now closes with escape key
- Textured objects using halftone dithering now show their original texture while preview is being generated
- Show checkboard error overlay in world space (when zone has invalid config).
2026-05-22 08:12:49 +01:00
396cca82bb Add 'paint by color' utility. Add minimum visibility offset 2026-05-17 10:38:45 +01:00
873d0ed26e Graphics Preferences: Anti-aliasing + FPS (#13538)
* Expose Antialiasing velues

Expose Antialiasing multipliers.
Default to 4 as current implementation but enables the user to disable it to improve performante or increase sampling to improve quality.

* FXAA

* Improve descriptions

* Require restart when MSAA setting changes

Detect changes to the OpenGL MSAA (multisample anti-aliasing) preference when opening Preferences and prompt the user to restart the application to apply the change. Adds a constant key for the MSAA setting, stores the previous value, checks for changes (similar to the existing FXAA handling), and shows a warning dialog explaining the restart will close the current project without saving. If the user accepts, recreate_GUI is invoked to apply the MSAA change immediately.

* Revert "Require restart when MSAA setting changes"

This reverts commit dde134d346c3849598c91d025d2faed1b51c8a22.

* Menu and FPS options

* Fix FPS limiter and remove VSYNC

* Grouped FPS settings and mode up rigth fps counter

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
2026-05-17 13:31:51 +08:00
9468e8b335 Add 'Paint by slope' dialog in region painting panel 2026-05-11 18:15:44 +01:00
33325df15d Merge ImageMap into mainline OrcaSlicer (up to aa9c2501e) 2026-05-02 11:50:23 +01:00
6e063bdc8d ENH: 3dbed: support rendering extruder area with different color
JIRA: STUDIO-7494
Change-Id: I717999e8b7ab1d7d350299b412a3a270c6ba7a9e
(cherry picked from commit 62b1d00d1fd6675fd067b76778d6a577dfae0c24)
2025-08-24 23:18:12 +08:00
70495a3bf9 Use texture instead of texelFetch to make it smoother 2024-08-19 23:11:01 +08:00
13e18d1d65 Use a 2-pass depth based outline algorithm when selected 2024-08-18 19:31:08 +08:00
27f140fb18 Mdel preview renders the actual colors of the filaments based on the filaments currently loaded in the AMS
Ported from BambuStudio
2024-06-16 17:15:51 +08:00
685de31088 Revert "Add a simple subtle outline effect by drawing back faces using wireframe mode (#2934)"
This reverts commit 0cee513416.
2023-12-05 22:05:11 +08:00
0cee513416 Add a simple subtle outline effect by drawing back faces using wireframe mode (#2934)
* Add a simple subtle outline effect by drawing back faces using wireframe mode

* Show outline in white if the model color is too dark

* Make the outline algorithm more reliable

* Enable cull face, which fix render on Linux

* Fix `disable_cullface`
2023-12-03 09:27:03 +08:00
03a9014d3a Show wireframe in MMU painter gizmo (#2808)
* Remove unused shader files

* Port wireframe shader from BBS

* Enable wireframe in MMU painter

Co-Authored-By: zhou.xu <zhou.xu@bambulab.com>

---------

Co-authored-by: zhou.xu <zhou.xu@bambulab.com>
2023-11-21 17:17:22 +08:00
090a9247cb Cut: Fix model rendering 2023-11-04 11:41:11 +08:00
19ad0ca4d9 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders
(cherry picked from commit prusa3d/PrusaSlicer@c468dcbed7)
2023-11-04 11:41:06 +08:00
fe78e40cb4 Various fixes 2023-11-04 11:41:06 +08:00
0d27e084f3 Fix thumbnail shader 2023-11-04 11:41:05 +08:00
1e4f16bd39 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140
(cherry picked from commit prusa3d/PrusaSlicer@76d1d4949b)
2023-11-04 11:41:05 +08:00