Skip to content
This repository was archived by the owner on Apr 9, 2019. It is now read-only.

Fix weight factors of the mass matrix. #3

Open
castano wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix weight factors of the mass matrix. #3

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
15 changes: 8 additions & 7 deletions bake_filter_least_squares.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ void filter_mesh_least_squares(
const bake::SampleInfo& info = ao_samples.sample_infos[i];
const int3& tri = tri_vertex_indices[info.tri_idx];

const float val = ao_values[i] * info.dA;
const float dA2 = info.dA * info.dA;
const float val = ao_values[i] * dA2;

vertex_ao[tri.x] += info.bary[0] * val;
vertex_ao[tri.y] += info.bary[1] * val;
Expand All @@ -292,25 +293,25 @@ void filter_mesh_least_squares(
// Note: the reference paper suggests computing the mass matrix analytically.
// Building it from samples gave smoother results for low numbers of samples per face.

triplet_map[ std::make_pair( tri.x, tri.x ) ] += static_cast<ScalarType>( info.bary[0]*info.bary[0]*info.dA );
triplet_map[ std::make_pair( tri.y, tri.y ) ] += static_cast<ScalarType>( info.bary[1]*info.bary[1]*info.dA );
triplet_map[ std::make_pair( tri.z, tri.z ) ] += static_cast<ScalarType>( info.bary[2]*info.bary[2]*info.dA );
triplet_map[ std::make_pair( tri.x, tri.x ) ] += static_cast<ScalarType>( info.bary[0]*info.bary[0]*dA2 );
triplet_map[ std::make_pair( tri.y, tri.y ) ] += static_cast<ScalarType>( info.bary[1]*info.bary[1]*dA2 );
triplet_map[ std::make_pair( tri.z, tri.z ) ] += static_cast<ScalarType>( info.bary[2]*info.bary[2]*dA2 );


{
const double elem = static_cast<ScalarType>(info.bary[0]*info.bary[1]*info.dA);
const double elem = static_cast<ScalarType>(info.bary[0]*info.bary[1]*dA2);
triplet_map[ std::make_pair( tri.x, tri.y ) ] += elem;
triplet_map[ std::make_pair( tri.y, tri.x ) ] += elem;
}

{
const double elem = static_cast<ScalarType>(info.bary[1]*info.bary[2]*info.dA);
const double elem = static_cast<ScalarType>(info.bary[1]*info.bary[2]*dA2);
triplet_map[ std::make_pair( tri.y, tri.z ) ] += elem;
triplet_map[ std::make_pair( tri.z, tri.y ) ] += elem;
}

{
const double elem = static_cast<ScalarType>(info.bary[2]*info.bary[0]*info.dA);
const double elem = static_cast<ScalarType>(info.bary[2]*info.bary[0]*dA2);
triplet_map[ std::make_pair( tri.x, tri.z ) ] += elem;
triplet_map[ std::make_pair( tri.z, tri.x ) ] += elem;
}
Expand Down