qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 18:31:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change position to vposition.

Browse source
This commit is contained in:
Bill Currie 2012-05-11 19:17:21 +09:00
parent 099ef348c6
commit 8387d987e2
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/video/renderer/glsl/glsl_iqm.c
View file

@ -82,7 +82,7 @@ static struct {
shaderparam_t texcoord;
shaderparam_t vtangent;
shaderparam_t vnormal;
shaderparam_t position;
shaderparam_t vposition;
lightpar_t lights[MAX_IQM_LIGHTS];
shaderparam_t texture;
shaderparam_t normalmap;
@ -98,7 +98,7 @@ static struct {
{"texcoord", 0},
{"vtangent", 0},
{"vnormal", 0},
{"position", 0},
{"vposition", 0},
{
{{"lights[0].position", 1}, {"lights[0].color", 1}},
{{"lights[1].position", 1}, {"lights[1].color", 1}},
@ -120,7 +120,7 @@ static struct va_attr_s {
GLenum type;
GLboolean normalized;
} vertex_attribs[] = {
{&iqm_shader.position, 3, GL_FLOAT, 0},
{&iqm_shader.vposition, 3, GL_FLOAT, 0},
{&iqm_shader.texcoord, 2, GL_FLOAT, 0},
{&iqm_shader.vnormal, 3, GL_FLOAT, 0},
{&iqm_shader.vtangent, 4, GL_FLOAT, 0},
@ -150,7 +150,7 @@ glsl_R_InitIQM (void)
GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.texcoord);
GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.vtangent);
GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.vnormal);
GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.position);
GLSL_ResolveShaderParam (iqm_shader.program, &iqm_shader.vposition);
for (i = 0; i < MAX_IQM_LIGHTS; i++) {
GLSL_ResolveShaderParam (iqm_shader.program,
&iqm_shader.lights[i].position);

4
libs/video/renderer/glsl/iqm.vert
View file

@ -7,7 +7,7 @@ attribute vec4 vbones;
attribute vec2 texcoord;
attribute vec4 vtangent;
attribute vec3 vnormal;
attribute vec3 position;
attribute vec3 vposition;
varying vec3 bitangent;
varying vec3 tangent;
@ -34,7 +34,7 @@ main (void)
// extract translation from dual quaternion
tr = 2.0 * (q0.w * qe.xyz - qe.w * q0.xyz - cross (qe.xyz, q0.xyz));
// apply rotation and translation
v = position;
v = vposition;
v += 2.0 * cross (q0.xyz, cross (q0.xyz, v) + q0.w * v) + tr;
// apply shear
v.z += v.y * sh.z + v.x * sh.y;