AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Athena, squelched some warnings

This commit is contained in:
Jack Andersen 2015-11-14 13:59:38 -10:00
parent a37a300be0
commit 77c5f8c089
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit 39dd15cd55e6432a4ea35949c81ef1803cc8955e Subproject commit df43b72f8ac860c6662896cd97498a4091a6174d

7
hecl/lib/Backend/GLSL.cpp
View File

@ -115,12 +115,9 @@ std::string GLSL::makeVert(const char* glslVer, unsigned col, unsigned uv, unsig
retval += " vec4 posAccum = vec4(0.0,0.0,0.0,0.0);\n" retval += " vec4 posAccum = vec4(0.0,0.0,0.0,0.0);\n"
" vec4 normAccum = vec4(0.0,0.0,0.0,0.0);\n"; " vec4 normAccum = vec4(0.0,0.0,0.0,0.0);\n";
for (size_t i=0 ; i<skinSlots ; ++i) for (size_t i=0 ; i<skinSlots ; ++i)
retval += HECL::Format(" posAccum += (vu.mv[%u] * vec4(posIn, 1.0)) * weightIn[%u][%u]\n" retval += HECL::Format(" posAccum += (vu.mv[%" PRISize "] * vec4(posIn, 1.0)) * weightIn[%" PRISize "][%" PRISize "]\n"
" normAccum += (vu.mvInv[%u] * vec4(normIn, 1.0)) * weightIn[%u][%u]\n", " normAccum += (vu.mvInv[%" PRISize "] * vec4(normIn, 1.0)) * weightIn[%" PRISize "][%" PRISize "]\n",
i, i/4, i%4, i, i/4, i%4); i, i/4, i%4, i, i/4, i%4);
retval += HECL::Format(" posAccum /= %u;\n"
" normAccum /= %u;\n",
skinSlots, skinSlots);
retval += " posAccum[3] = 1.0\n" retval += " posAccum[3] = 1.0\n"
" vtf.mvPos = posAccum;\n" " vtf.mvPos = posAccum;\n"
" vtf.mvNorm = vec4(normalize(normAccum.xyz), 0.0);\n" " vtf.mvNorm = vec4(normalize(normAccum.xyz), 0.0);\n"