libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-28 10:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix strange offset of skinned meshes in HW transform (helmet outside body etc)

Browse Source
This commit is contained in:
Henrik Rydgard 2013-04-20 23:36:12 +02:00
parent b52d21bd4a
commit dd0088e6b8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
GPU/GLES/VertexShaderGenerator.cpp
View File

@ -88,6 +88,7 @@ void ComputeVertexShaderID(VertexShaderID *id, int prim) {
// Okay, d[1] coming up. ============== // Okay, d[1] coming up. ==============
id->d[1] |= gstate.isLightingEnabled() << 24; id->d[1] |= gstate.isLightingEnabled() << 24;
id->d[1] |= ((vertType & GE_VTYPE_WEIGHT_MASK) >> GE_VTYPE_WEIGHT_SHIFT) << 25;
if (gstate.isLightingEnabled() || gstate.getUVGenMode() == 2) { if (gstate.isLightingEnabled() || gstate.getUVGenMode() == 2) {
// Light bits // Light bits
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
@ -294,7 +295,10 @@ void GenerateVertexShader(int prim, char *buffer) {
WRITE(p, " vec3 worldpos = vec3(0.0);\n"); WRITE(p, " vec3 worldpos = vec3(0.0);\n");
if (hasNormal) if (hasNormal)
WRITE(p, " vec3 worldnormal = vec3(0.0);\n"); WRITE(p, " vec3 worldnormal = vec3(0.0);\n");
int numWeights = 1 + ((vertType & GE_VTYPE_WEIGHTCOUNT_MASK) >> GE_VTYPE_WEIGHTCOUNT_SHIFT); int numWeights = 1 + ((vertType & GE_VTYPE_WEIGHTCOUNT_MASK) >> GE_VTYPE_WEIGHTCOUNT_SHIFT);
static const float rescale[4] = {0, 2*127.5f/128.f, 2*32767.5f/32768.f, 2.0f};
float factor = rescale[(vertType & GE_VTYPE_WEIGHT_MASK) >> GE_VTYPE_WEIGHT_SHIFT];
for (int i = 0; i < numWeights; i++) { for (int i = 0; i < numWeights; i++) {
const char *weightAttr = boneWeightAttr[i]; const char *weightAttr = boneWeightAttr[i];
// workaround for "cant do .x of scalar" issue // workaround for "cant do .x of scalar" issue
@ -304,8 +308,9 @@ void GenerateVertexShader(int prim, char *buffer) {
if (hasNormal) if (hasNormal)
WRITE(p, " worldnormal += %s * (u_bone%i * vec4(a_normal, 0.0)).xyz;\n", weightAttr, i); WRITE(p, " worldnormal += %s * (u_bone%i * vec4(a_normal, 0.0)).xyz;\n", weightAttr, i);
} }
// Finally, multiply by world matrix (yes, we have to). // Finally, multiply by world matrix (yes, we have to).
WRITE(p, " worldpos = (u_world * vec4(worldpos * 2.0, 1.0)).xyz;\n"); WRITE(p, " worldpos = (u_world * vec4(worldpos * %f, 1.0)).xyz;\n", factor);
if (hasNormal) if (hasNormal)
WRITE(p, " worldnormal = (u_world * vec4(worldnormal, 0.0)).xyz;\n"); WRITE(p, " worldnormal = (u_world * vec4(worldnormal, 0.0)).xyz;\n");
} }