Skip to content

Fix BaseMaterial3D UV Offset/Scale and Emission on UV2 ignored when baking VoxelGI #111974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+66 −16
Open

Fix BaseMaterial3D UV Offset/Scale and Emission on UV2 ignored when baking VoxelGI #111974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 59 additions & 15 deletions scene/3d/voxelizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,22 @@

#include "core/config/project_settings.h"

static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3 *p_vtx, const Vector2 *p_uv, const Vector3 *p_normal, Vector2 &r_uv, Vector3 &r_normal) {
static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3 *p_vtx, const Vector2 *p_uv, const Vector2 *p_uv2, const Vector3 *p_normal, Vector2 &r_uv, Vector2 &r_uv2, Vector3 &r_normal) {
if (p_pos.is_equal_approx(p_vtx[0])) {
r_uv = p_uv[0];
r_uv2 = p_uv2[0];
r_normal = p_normal[0];
return;
}
if (p_pos.is_equal_approx(p_vtx[1])) {
r_uv = p_uv[1];
r_uv2 = p_uv2[1];
r_normal = p_normal[1];
return;
}
if (p_pos.is_equal_approx(p_vtx[2])) {
r_uv = p_uv[2];
r_uv2 = p_uv2[2];
r_normal = p_normal[2];
return;
}
Expand All @@ -61,6 +64,7 @@ static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3
real_t denom = (d00 * d11 - d01 * d01);
if (denom == 0) {
r_uv = p_uv[0];
r_uv2 = p_uv2[0];
r_normal = p_normal[0];
return;
}
Expand All @@ -69,10 +73,11 @@ static _FORCE_INLINE_ void get_uv_and_normal(const Vector3 &p_pos, const Vector3
real_t u = 1.0f - v - w;

r_uv = p_uv[0] * u + p_uv[1] * v + p_uv[2] * w;
r_uv2 = p_uv2[0] * u + p_uv2[1] * v + p_uv2[2] * w;
r_normal = (p_normal[0] * u + p_normal[1] * v + p_normal[2] * w).normalized();
}

void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector3 *p_normal, const Vector2 *p_uv, const MaterialCache &p_material, const AABB &p_aabb) {
void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector3 *p_normal, const Vector2 *p_uv, const Vector2 *p_uv2, const MaterialCache &p_material, const AABB &p_aabb) {
if (p_level == cell_subdiv) {
//plot the face by guessing its albedo and emission value

Expand Down Expand Up @@ -146,24 +151,33 @@ void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, co
intersection = Face3(p_vtx[0], p_vtx[1], p_vtx[2]).get_closest_point_to(intersection);

Vector2 uv;
Vector2 uv2;
Vector3 lnormal;
get_uv_and_normal(intersection, p_vtx, p_uv, p_normal, uv, lnormal);
get_uv_and_normal(intersection, p_vtx, p_uv, p_uv2, p_normal, uv, uv2, lnormal);
if (lnormal == Vector3()) { //just in case normal is not provided
lnormal = normal;
}

int uv_x = CLAMP(int(Math::fposmod(uv.x, (real_t)1.0) * bake_texture_size), 0, bake_texture_size - 1);
int uv_y = CLAMP(int(Math::fposmod(uv.y, (real_t)1.0) * bake_texture_size), 0, bake_texture_size - 1);

int uv_x = CLAMP(int(Math::fposmod(uv.x * p_material.uv1_scale.x + p_material.uv1_offset.x, (real_t)1.0) * bake_texture_size), 0, bake_texture_size - 1);
int uv_y = CLAMP(int(Math::fposmod(uv.y * p_material.uv1_scale.y + p_material.uv1_offset.y, (real_t)1.0) * bake_texture_size), 0, bake_texture_size - 1);
int ofs = uv_y * bake_texture_size + uv_x;

albedo_accum.r += p_material.albedo[ofs].r;
albedo_accum.g += p_material.albedo[ofs].g;
albedo_accum.b += p_material.albedo[ofs].b;
albedo_accum.a += p_material.albedo[ofs].a;

emission_accum.r += p_material.emission[ofs].r;
emission_accum.g += p_material.emission[ofs].g;
emission_accum.b += p_material.emission[ofs].b;
int uv_emission_x = uv_x;
int uv_emission_y = uv_y;
if (p_material.emission_on_uv2) {
uv_emission_x = CLAMP(int(Math::fposmod(uv2.x * p_material.uv2_scale.x + p_material.uv2_offset.x, (real_t)1.0) * bake_texture_size), 0, bake_texture_size - 1);
uv_emission_y = CLAMP(int(Math::fposmod(uv2.y * p_material.uv2_scale.y + p_material.uv2_offset.y, (real_t)1.0) * bake_texture_size), 0, bake_texture_size - 1);
}
int ofs_emission = uv_emission_y * bake_texture_size + uv_emission_x;

emission_accum.r += p_material.emission[ofs_emission].r;
emission_accum.g += p_material.emission[ofs_emission].g;
emission_accum.b += p_material.emission[ofs_emission].b;

normal_accum += lnormal;

Expand All @@ -179,13 +193,14 @@ void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, co

Vector3 lnormal;
Vector2 uv;
get_uv_and_normal(inters, p_vtx, p_uv, p_normal, uv, normal);
Vector2 uv2;
get_uv_and_normal(inters, p_vtx, p_uv, p_uv2, p_normal, uv, uv2, lnormal);
if (lnormal == Vector3()) { //just in case normal is not provided
lnormal = normal;
}

int uv_x = CLAMP(Math::fposmod(uv.x, (real_t)1.0) * bake_texture_size, 0, bake_texture_size - 1);
int uv_y = CLAMP(Math::fposmod(uv.y, (real_t)1.0) * bake_texture_size, 0, bake_texture_size - 1);
int uv_x = CLAMP(Math::fposmod(uv.x * p_material.uv1_scale.x + p_material.uv1_offset.x, (real_t)1.0) * bake_texture_size, 0, bake_texture_size - 1);
int uv_y = CLAMP(Math::fposmod(uv.y * p_material.uv1_scale.y + p_material.uv1_offset.y, (real_t)1.0) * bake_texture_size, 0, bake_texture_size - 1);

int ofs = uv_y * bake_texture_size + uv_x;

Expand Down Expand Up @@ -283,7 +298,7 @@ void Voxelizer::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, co
bake_cells.write[child_idx].z = nz / half;
}

_plot_face(bake_cells[p_idx].children[i], p_level + 1, nx, ny, nz, p_vtx, p_normal, p_uv, p_material, aabb);
_plot_face(bake_cells[p_idx].children[i], p_level + 1, nx, ny, nz, p_vtx, p_normal, p_uv, p_uv2, p_material, aabb);
}
}
}
Expand Down Expand Up @@ -377,11 +392,20 @@ Voxelizer::MaterialCache Voxelizer::_get_material_cache(Ref<Material> p_material
mc.emission = _get_bake_texture(empty, Color(0, 0, 0), Color(0, 0, 0));
}

mc.uv1_scale = mat->get_uv1_scale();
mc.uv1_offset = mat->get_uv1_offset();
mc.uv2_scale = mat->get_uv2_scale();
mc.uv2_offset = mat->get_uv2_offset();
mc.emission_on_uv2 = mat->get_flag(BaseMaterial3D::FLAG_EMISSION_ON_UV2);
} else {
Ref<Image> empty;

mc.albedo = _get_bake_texture(empty, Color(0, 0, 0), Color(1, 1, 1));
mc.emission = _get_bake_texture(empty, Color(0, 0, 0), Color(0, 0, 0));
mc.uv1_scale = Vector3(1, 1, 1);
mc.uv1_offset = Vector3(0, 0, 0);
mc.uv2_scale = Vector3(1, 1, 1);
mc.uv2_offset = Vector3(0, 0, 0);
}

material_cache[p_material] = mc;
Expand Down Expand Up @@ -432,6 +456,8 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
const Vector3 *vr = vertices.ptr();
Vector<Vector2> uv = a[Mesh::ARRAY_TEX_UV];
const Vector2 *uvr = nullptr;
Vector<Vector2> uv2 = a[Mesh::ARRAY_TEX_UV2];
const Vector2 *uv2r = nullptr;
Vector<Vector3> normals = a[Mesh::ARRAY_NORMAL];
const Vector3 *nr = nullptr;
Vector<int> index = a[Mesh::ARRAY_INDEX];
Expand All @@ -440,6 +466,10 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
uvr = uv.ptr();
}

if (uv2.size()) {
uv2r = uv2.ptr();
}

if (normals.size()) {
nr = normals.ptr();
}
Expand All @@ -451,6 +481,7 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
for (int j = 0; j < facecount; j++) {
Vector3 vtxs[3];
Vector2 uvs[3];
Vector2 uv2s[3];
Vector3 normal[3];

bake_current++;
Expand All @@ -470,6 +501,12 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
}
}

if (uv2r) {
for (int k = 0; k < 3; k++) {
uv2s[k] = uv2r[ir[j * 3 + k]];
}
}

if (nr) {
for (int k = 0; k < 3; k++) {
normal[k] = normal_xform.xform(nr[ir[j * 3 + k]]).normalized();
Expand All @@ -481,7 +518,7 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
continue;
}
//plot
_plot_face(0, 0, 0, 0, 0, vtxs, normal, uvs, material, po2_bounds);
_plot_face(0, 0, 0, 0, 0, vtxs, normal, uvs, uv2s, material, po2_bounds);
}

} else {
Expand All @@ -490,6 +527,7 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
for (int j = 0; j < facecount; j++) {
Vector3 vtxs[3];
Vector2 uvs[3];
Vector2 uv2s[3];
Vector3 normal[3];

bake_current++;
Expand All @@ -509,6 +547,12 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
}
}

if (uv2r) {
for (int k = 0; k < 3; k++) {
uv2s[k] = uv2r[j * 3 + k];
}
}

if (nr) {
for (int k = 0; k < 3; k++) {
normal[k] = nr[j * 3 + k];
Expand All @@ -520,7 +564,7 @@ Voxelizer::BakeResult Voxelizer::plot_mesh(const Transform3D &p_xform, Ref<Mesh>
continue;
}
//plot face
_plot_face(0, 0, 0, 0, 0, vtxs, normal, uvs, material, po2_bounds);
_plot_face(0, 0, 0, 0, 0, vtxs, normal, uvs, uv2s, material, po2_bounds);
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion scene/3d/voxelizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@ class Voxelizer {
//128x128 textures
Vector<Color> albedo;
Vector<Color> emission;

Vector3 uv1_scale;
Vector3 uv1_offset;
Vector3 uv2_scale;
Vector3 uv2_offset;
bool emission_on_uv2 = false;
};

HashMap<Ref<Material>, MaterialCache> material_cache;
Expand All @@ -111,7 +117,7 @@ class Voxelizer {
Vector<Color> _get_bake_texture(Ref<Image> p_image, const Color &p_color_mul, const Color &p_color_add);
MaterialCache _get_material_cache(Ref<Material> p_material);

void _plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector3 *p_normal, const Vector2 *p_uv, const MaterialCache &p_material, const AABB &p_aabb);
void _plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector3 *p_normal, const Vector2 *p_uv, const Vector2 *p_uv2, const MaterialCache &p_material, const AABB &p_aabb);
void _fixup_plot(int p_idx, int p_level);
void _debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Ref<MultiMesh> &p_multimesh, int &idx);

Expand Down