Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-19 13:44:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exploring the possible packing schemes and trying to debug the tangent

Browse source
This commit is contained in:
Sam Gateau 2018-09-30 23:11:36 -07:00
parent 1ff4c54c1c
commit 5842416ae6
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/render-utils/src/Blendshape.slh
View file

@ -11,7 +11,7 @@
<@func declareBlendshape(USE_NORMAL, USE_TANGENT)@>
struct PackedBlendshapeOffset {
ivec4 packedPosNorTan;
uvec4 packedPosNorTan;
};
struct BlendshapeOffset {
@ -26,14 +26,14 @@ struct BlendshapeOffset {
const float oneOver511 = 1.0 / 511.0;
vec3 unpackSnorm3x10_1x2(int packed) {
vec4 unpacked = vec4(
float( (packed & 0x000003FF) - 512 ),
float( ((packed >> 10) & 0x000003FF) - 512 ),
float( ((packed >> 20) & 0x000003FF) - 512 ),
float( (packed >> 30) & 0x00000003 )
vec3 unpackSnorm3x10_1x2(int packedX10Y10Z10A2) {
vec4 my_unpacked = vec4(
clamp( float( (packedX10Y10Z10A2 & 0x000003FF) - 511 ) / 511.0, -1.0, 1.0),
clamp( float( ((packedX10Y10Z10A2 >> 10) & 0x000003FF) - 511 ) / 511.0, -1.0, 1.0),
clamp( float( ((packedX10Y10Z10A2 >> 20) & 0x000003FF) - 511 ) / 511.0, -1.0, 1.0),
0.0//clamp( float( int((packedX10Y10Z10A2 >> 30) & 0x00000003) - 1 ), -1.0, 1.0)
);
return clamp(unpacked.xyz * oneOver511, vec3(-1.0), vec3(1.0));
return my_unpacked.xyz;
}
#if defined(GPU_GL410)
@ -59,9 +59,11 @@ BlendshapeOffset getBlendshapeOffset(int i) {
ivec4 elem_packed = _packedBlendshapeOffsets[i];
BlendshapeOffset unpacked;
unpacked.position = vec3(unpackHalf2x16(uint(elem_packed.x)), unpackHalf2x16(uint(elem_packed.y)).x);
vec2 pZnZ = unpackHalf2x16(uint(elem_packed.y));
unpacked.position = vec3(unpackHalf2x16(uint(elem_packed.x)), pZnZ.x);
<@if USE_NORMAL@>
unpacked.normal = unpackSnorm3x10_1x2((elem_packed.z)).xyz;
unpacked.normal = vec3(unpackHalf2x16(uint(elem_packed.z)), pZnZ.y);
//unpacked.normal = unpackSnorm3x10_1x2((elem_packed.z)).xyz;
<@endif@>
<@if USE_TANGENT@>
unpacked.tangent = unpackSnorm3x10_1x2((elem_packed.w)).xyz;
@ -85,7 +87,7 @@ void evalBlendshape(int i, vec4 inPosition, out vec4 position
normal = normalize(inNormal + blendshapeOffset.normal.xyz);
<@endif@>
<@if USE_TANGENT@>
tangent = normalize(inTangent + blendshapeOffset.tangent.xyz);
tangent = normalize(inTangent /*+ blendshapeOffset.tangent.xyz*/);
<@endif@>
}

13
libraries/render-utils/src/Model.cpp
View file

@ -1651,7 +1651,8 @@ void Blender::run() {
offset += modelMeshBlendshapeOffsets->second.size();
std::vector<BlendshapeOffsetUnpacked> unpackedBlendshapeOffsets(modelMeshBlendshapeOffsets->second.size());
const float NORMAL_COEFFICIENT_SCALE = 0.01f;
// const float NORMAL_COEFFICIENT_SCALE = 0.01f;
const float NORMAL_COEFFICIENT_SCALE = 1.0f;
for (int i = 0, n = qMin(_blendshapeCoefficients.size(), mesh.blendshapes.size()); i < n; i++) {
float vertexCoefficient = _blendshapeCoefficients.at(i);
const float EPSILON = 0.0001f;
@ -1691,15 +1692,17 @@ void Blender::run() {
}
#ifdef PACKED_BLENDSHAPE_OFFSET
tbb::parallel_for(tbb::blocked_range<int>(0, unpackedBlendshapeOffsets.size()), [&](const tbb::blocked_range<int>& range) {
tbb::parallel_for(tbb::blocked_range<int>(0, (int) unpackedBlendshapeOffsets.size()), [&](const tbb::blocked_range<int>& range) {
auto unpacked = unpackedBlendshapeOffsets.data() + range.begin();
auto packed = meshBlendshapeOffsets + range.begin();
for (auto j = range.begin(); j < range.end(); j++) {
(*packed).packedPosNorTan = glm::uvec4(
glm::packHalf2x16(glm::vec2(unpacked->positionOffsetAndSpare)),
glm::packHalf2x16(glm::vec2(unpacked->positionOffsetAndSpare.z, 0.0f)),
glm::packSnorm3x10_1x2(glm::vec4(unpacked->normalOffsetAndSpare, 0.0f)),
glm::packSnorm3x10_1x2(glm::vec4(unpacked->tangentOffsetAndSpare, 0.0f)));
glm::packHalf2x16(glm::vec2(unpacked->positionOffsetAndSpare.z, unpacked->normalOffsetAndSpare.z)),
glm::packHalf2x16(glm::vec2(unpacked->normalOffsetAndSpare)),
glm::packSnorm3x10_1x2(glm::vec4(unpacked->tangentOffsetAndSpare, 0.0f))
);
unpacked++;
packed++;
}

2
libraries/render-utils/src/Model.h
View file

@ -80,7 +80,7 @@ struct SortedTriangleSet {
#define PACKED_BLENDSHAPE_OFFSET 1
#ifdef PACKED_BLENDSHAPE_OFFSET
struct BlendshapeOffsetPacked {
glm::ivec4 packedPosNorTan;
glm::uvec4 packedPosNorTan;
};
struct BlendshapeOffsetUnpacked {