juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-10-15 03:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Texture displacement: mix filament colours in the slicer (#16242)

Browse Source
This commit is contained in:
ExPikaPaka
2026-10-09 17:52:35 +08:00
committed by GitHub
parent 1bddcf3ab6
commit 62b829d1cb
19 changed files with 324 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libslic3r/TextureBake/TextureBakeMesh.cpp
+12 -1
View File
@@ -3,6 +3,7 @@
#include "libslic3r/Point.hpp"
#include <algorithm>
#include <utility>
#include <vector>
#include <cstdint>
#include <cstddef>
@@ -42,7 +43,7 @@ TriSoup to_soup(const indexed_triangle_set &its, const std::vector<uint8_t> &fac
return out;
}
indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup)
indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup, std::vector<int> *face_color)
{
indexed_triangle_set out;
const size_t n = soup.pos.size();
@@ -54,12 +55,22 @@ indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup)
if (map.inserted())
out.vertices.push_back(soup.pos[i]);
}
const bool track_color = face_color != nullptr && !face_color->empty();
std::vector<int> kept_color;
if (track_color)
kept_color.reserve(face_color->size());
for (size_t t = 0; t + 2 < n; t += 3) {
// Welded-together corners carry no area.
if (id[t] == id[t + 1] || id[t + 1] == id[t + 2] || id[t] == id[t + 2])
continue;
out.indices.emplace_back(id[t], id[t + 1], id[t + 2]);
if (track_color) {
const size_t src = t / 3;
kept_color.push_back(src < face_color->size() ? (*face_color)[src] : -1);
}
}
if (track_color)
*face_color = std::move(kept_color);
return out;
}