nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

paint tool: sculpt mode update

Browse Source
This commit is contained in:
turanszkij
2020-04-05 13:51:45 +01:00
parent 3f219076fb
commit 8cc52a171e
1 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/PaintToolWindow.cpp
+33 -14
View File
@@ -496,6 +496,16 @@ void PaintToolWindow::Update(float dt)
bool rebuild = false;
if (painting)
{
XMVECTOR averageNormal = XMVectorZero();
struct PaintVert
{
size_t ind;
float affection;
};
static std::vector<PaintVert> paintindices;
paintindices.clear();
paintindices.reserve(mesh->vertex_positions.size());
for (size_t j = 0; j < mesh->vertex_positions.size(); ++j)
{
XMVECTOR P, N;
@@ -522,23 +532,32 @@ void PaintToolWindow::Update(float dt)
const float dist = XMVectorGetX(XMVector2Length(C - P));
if (z >= 0 && z <= 1 && dist <= radius)
{
RecordHistory(true);
XMVECTOR PL = XMLoadFloat3(&mesh->vertex_positions[j]);
const XMVECTOR NL = XMLoadFloat3(&mesh->vertex_normals[j]);
averageNormal += N;
const float affection = amount * std::powf(1 - (dist / radius), falloff);
switch (mode)
{
case MODE_SCULPTING_ADD:
PL += NL * affection;
break;
case MODE_SCULPTING_SUBTRACT:
PL -= NL * affection;
break;
}
XMStoreFloat3(&mesh->vertex_positions[j], PL);
rebuild = true;
paintindices.push_back({ j, affection });
}
}
if (!paintindices.empty())
{
RecordHistory(true);
rebuild = true;
averageNormal = XMVector3Normalize(averageNormal);
}
for (auto& x : paintindices)
{
XMVECTOR PL = XMLoadFloat3(&mesh->vertex_positions[x.ind]);
switch (mode)
{
case MODE_SCULPTING_ADD:
PL += averageNormal * x.affection;
break;
case MODE_SCULPTING_SUBTRACT:
PL -= averageNormal * x.affection;
break;
}
XMStoreFloat3(&mesh->vertex_positions[x.ind], PL);
}
}
if (wireframe)