ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some parts of skinning

This commit is contained in:
Jannik Vogel 2015-07-16 14:41:30 +02:00
parent 3ffbb446eb
commit 8a43da637a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/xbox/nv2a.c
View File

@ -2688,21 +2688,22 @@ static ShaderBinding* generate_shaders(const ShaderState state)
qstring_append_fmt(vertex_shader_code, "/* Skinning mode %d */\n",
state.skinning);
if (count == 0) {
qstring_append(vertex_shader_code, "vec4 tPosition = position * modelViewMat0;\n");
qstring_append(vertex_shader_code, "vec4 tPosition = position;\n");
/* FIXME: Is the normal still transformed? */
qstring_append(vertex_shader_code, "vec3 tNormal = (invModelViewMat0 * vec4(normal, 0.0)).xyz;\n");
} else {
qstring_append(vertex_shader_code, "vec4 tPosition = vec4(0.0);\n");
qstring_append(vertex_shader_code, "vec3 tNormal = vec3(0.0);\n");
if (mix) {
/* Tweening */
/*
This should *probably* be something like:
if (count == 2) {
pos = mix(position*modelViewMat0,position*modelViewMat1,weight.x)
}
Not sure about higher amount of matrices.
/*
assert(false);
if (count == 2) {
qstring_append(vertex_shader_code, "tPosition += mix(position * modelViewMat1,"
" position * modelViewMat0, weight.x);\n");
} else {
/* FIXME: Not sure how blend weights are calculated */
assert(false);
}
} else {
/* Individual matrices */
for (i = 0; i < count; i++) {
@ -2774,11 +2775,7 @@ static ShaderBinding* generate_shaders(const ShaderState state)
}
qstring_append(vertex_shader_code,
#if 0
" gl_Position = position * modelViewMat0 * projectionMat;\n"
#else
" gl_Position = invViewport * (position * compositeMat);\n"
#endif
" gl_Position = invViewport * (tPosition * compositeMat);\n"
/* temp hack: the composite matrix includes the view transform... */
//" gl_Position = position * compositeMat;\n"
//" gl_Position.x = (gl_Position.x - 320.0) / 320.0;\n"