[iortcw] 126/497: All: Rend2: Reimplement MD3 tangent space calculation
Simon McVittie
smcv at debian.org
Fri Sep 8 10:36:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit a0b5f69f747745dd3a86cdd8a8fa5ae59b1b7c4d
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Wed May 28 23:11:43 2014 +0000
All: Rend2: Reimplement MD3 tangent space calculation
---
MP/code/rend2/tr_init.c | 2 -
MP/code/rend2/tr_local.h | 6 +-
MP/code/rend2/tr_main.c | 36 ++++++------
MP/code/rend2/tr_model.c | 148 +++++++++++++++++++----------------------------
SP/code/rend2/tr_init.c | 2 -
SP/code/rend2/tr_local.h | 6 +-
SP/code/rend2/tr_main.c | 36 ++++++------
SP/code/rend2/tr_model.c | 146 ++++++++++++++++++----------------------------
8 files changed, 159 insertions(+), 223 deletions(-)
diff --git a/MP/code/rend2/tr_init.c b/MP/code/rend2/tr_init.c
index 3e1e72f..5b41d63 100644
--- a/MP/code/rend2/tr_init.c
+++ b/MP/code/rend2/tr_init.c
@@ -165,7 +165,6 @@ cvar_t *r_baseNormalY;
cvar_t *r_baseParallax;
cvar_t *r_baseSpecular;
cvar_t *r_baseGloss;
-cvar_t *r_recalcMD3Normals;
cvar_t *r_mergeLightmaps;
cvar_t *r_dlightMode;
cvar_t *r_pshadowDist;
@@ -1321,7 +1320,6 @@ void R_Register( void ) {
r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.3", CVAR_ARCHIVE | CVAR_LATCH );
r_dlightMode = ri.Cvar_Get( "r_dlightMode", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_pshadowDist = ri.Cvar_Get( "r_pshadowDist", "128", CVAR_ARCHIVE );
- r_recalcMD3Normals = ri.Cvar_Get( "r_recalcMD3Normals", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_mergeLightmaps = ri.Cvar_Get( "r_mergeLightmaps", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_imageUpsample = ri.Cvar_Get( "r_imageUpsample", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_imageUpsampleMaxSize = ri.Cvar_Get( "r_imageUpsampleMaxSize", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/MP/code/rend2/tr_local.h b/MP/code/rend2/tr_local.h
index 9b59b71..09ddc30 100644
--- a/MP/code/rend2/tr_local.h
+++ b/MP/code/rend2/tr_local.h
@@ -2000,7 +2000,6 @@ extern cvar_t *r_baseSpecular;
extern cvar_t *r_baseGloss;
extern cvar_t *r_dlightMode;
extern cvar_t *r_pshadowDist;
-extern cvar_t *r_recalcMD3Normals;
extern cvar_t *r_mergeLightmaps;
extern cvar_t *r_imageUpsample;
extern cvar_t *r_imageUpsampleMaxSize;
@@ -2076,8 +2075,9 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader,
int fogIndex, int dlightMap, int pshadowMap, int cubemap );
-void R_CalcTangentSpace(vec3_t tangent, vec3_t bitangent, vec3_t normal,
- const vec3_t v0, const vec3_t v1, const vec3_t v2, const vec2_t t0, const vec2_t t1, const vec2_t t2);
+void R_CalcTexDirs(vec3_t sdir, vec3_t tdir, const vec3_t v1, const vec3_t v2,
+ const vec3_t v3, const vec2_t w1, const vec2_t w2, const vec2_t w3);
+void R_CalcTbnFromNormalAndTexDirs(vec3_t tangent, vec3_t bitangent, vec3_t normal, vec3_t sdir, vec3_t tdir);
qboolean R_CalcTangentVectors(srfVert_t * dv[3]);
#define CULL_IN 0 // completely unclipped
diff --git a/MP/code/rend2/tr_main.c b/MP/code/rend2/tr_main.c
index f473875..881c031 100644
--- a/MP/code/rend2/tr_main.c
+++ b/MP/code/rend2/tr_main.c
@@ -464,13 +464,11 @@ void R_CalcTangentSpaceFast(vec3_t tangent, vec3_t bitangent, vec3_t normal,
/*
http://www.terathon.com/code/tangent.html
*/
-void R_CalcTBN(vec3_t tangent, vec3_t bitangent, vec3_t normal,
- const vec3_t v1, const vec3_t v2, const vec3_t v3, const vec2_t w1, const vec2_t w2, const vec2_t w3)
+void R_CalcTexDirs(vec3_t sdir, vec3_t tdir, const vec3_t v1, const vec3_t v2,
+ const vec3_t v3, const vec2_t w1, const vec2_t w2, const vec2_t w3)
{
- vec3_t u, v;
float x1, x2, y1, y2, z1, z2;
- float s1, s2, t1, t2;
- float r, dot;
+ float s1, s2, t1, t2, r;
x1 = v2[0] - v1[0];
x2 = v3[0] - v1[0];
@@ -486,24 +484,28 @@ void R_CalcTBN(vec3_t tangent, vec3_t bitangent, vec3_t normal,
r = 1.0f / (s1 * t2 - s2 * t1);
- VectorSet(tangent, (t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r, (t2 * z1 - t1 * z2) * r);
- VectorSet(bitangent, (s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r, (s1 * z2 - s2 * z1) * r);
+ VectorSet(sdir, (t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r, (t2 * z1 - t1 * z2) * r);
+ VectorSet(tdir, (s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r, (s1 * z2 - s2 * z1) * r);
+}
- // compute the face normal based on vertex points
- VectorSubtract(v3, v1, u);
- VectorSubtract(v2, v1, v);
- CrossProduct(u, v, normal);
- VectorNormalize(normal);
+void R_CalcTbnFromNormalAndTexDirs(vec3_t tangent, vec3_t bitangent, vec3_t normal, vec3_t sdir, vec3_t tdir)
+{
+ vec3_t n_cross_t;
+ vec_t n_dot_t, handedness;
// Gram-Schmidt orthogonalize
- //tangent[a] = (t - n * Dot(n, t)).Normalize();
- dot = DotProduct(normal, tangent);
- VectorMA(tangent, -dot, normal, tangent);
+ n_dot_t = DotProduct(normal, sdir);
+ VectorMA(sdir, -n_dot_t, normal, tangent);
VectorNormalize(tangent);
- // B=NxT
- //CrossProduct(normal, tangent, bitangent);
+ // Calculate handedness
+ CrossProduct(normal, sdir, n_cross_t);
+ handedness = (DotProduct(n_cross_t, tdir) < 0.0f) ? -1.0f : 1.0f;
+
+ // Calculate bitangent
+ CrossProduct(normal, tangent, bitangent);
+ VectorScale(bitangent, handedness, bitangent);
}
void R_CalcTBN2(vec3_t tangent, vec3_t bitangent, vec3_t normal,
diff --git a/MP/code/rend2/tr_model.c b/MP/code/rend2/tr_model.c
index 6a9b988..02c7aa5 100644
--- a/MP/code/rend2/tr_model.c
+++ b/MP/code/rend2/tr_model.c
@@ -867,70 +867,54 @@ static qboolean R_LoadMDC( model_t *mod, int lod, void *buffer, const char *modN
#ifdef USE_VERT_TANGENT_SPACE
// calc tangent spaces
{
- // Valgrind complaints: Conditional jump or move depends on uninitialised value(s)
- // So lets Initialize them.
- const float *v0 = NULL, *v1 = NULL, *v2 = NULL;
- const float *t0 = NULL, *t1 = NULL, *t2 = NULL;
- vec3_t tangent = { 0, 0, 0 };
- vec3_t bitangent = { 0, 0, 0 };
- vec3_t normal = { 0, 0, 0 };
-
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
VectorClear(v->tangent);
VectorClear(v->bitangent);
- if (r_recalcMD3Normals->integer)
- VectorClear(v->normal);
}
for(f = 0; f < mdvModel->numFrames; f++)
{
for(j = 0, tri = surf->indexes; j < surf->numIndexes; j += 3, tri += 3)
{
- v0 = surf->verts[surf->numVerts * f + tri[0]].xyz;
- v1 = surf->verts[surf->numVerts * f + tri[1]].xyz;
- v2 = surf->verts[surf->numVerts * f + tri[2]].xyz;
+ vec3_t sdir, tdir;
+ const float *v0, *v1, *v2, *t0, *t1, *t2;
+ glIndex_t index0, index1, index2;
+
+ index0 = surf->numVerts * f + tri[0];
+ index1 = surf->numVerts * f + tri[1];
+ index2 = surf->numVerts * f + tri[2];
+
+ v0 = surf->verts[index0].xyz;
+ v1 = surf->verts[index1].xyz;
+ v2 = surf->verts[index2].xyz;
t0 = surf->st[tri[0]].st;
t1 = surf->st[tri[1]].st;
t2 = surf->st[tri[2]].st;
- if (!r_recalcMD3Normals->integer)
- VectorCopy(v->normal, normal);
- else
- VectorClear(normal);
-
- #if 1
- R_CalcTangentSpace(tangent, bitangent, normal, v0, v1, v2, t0, t1, t2);
- #else
- R_CalcNormalForTriangle(normal, v0, v1, v2);
- R_CalcTangentsForTriangle(tangent, bitangent, v0, v1, v2, t0, t1, t2);
- #endif
-
- for(k = 0; k < 3; k++)
- {
- float *v;
-
- v = surf->verts[surf->numVerts * f + tri[k]].tangent;
- VectorAdd(v, tangent, v);
-
- v = surf->verts[surf->numVerts * f + tri[k]].bitangent;
- VectorAdd(v, bitangent, v);
-
- if (r_recalcMD3Normals->integer)
- {
- v = surf->verts[surf->numVerts * f + tri[k]].normal;
- VectorAdd(v, normal, v);
- }
- }
+ R_CalcTexDirs(sdir, tdir, v0, v1, v2, t0, t1, t2);
+
+ VectorAdd(sdir, surf->verts[index0].tangent, surf->verts[index0].tangent);
+ VectorAdd(sdir, surf->verts[index1].tangent, surf->verts[index1].tangent);
+ VectorAdd(sdir, surf->verts[index2].tangent, surf->verts[index2].tangent);
+ VectorAdd(tdir, surf->verts[index0].bitangent, surf->verts[index0].bitangent);
+ VectorAdd(tdir, surf->verts[index1].bitangent, surf->verts[index1].bitangent);
+ VectorAdd(tdir, surf->verts[index2].bitangent, surf->verts[index2].bitangent);
}
}
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
- VectorNormalize(v->tangent);
- VectorNormalize(v->bitangent);
- VectorNormalize(v->normal);
+ vec3_t sdir, tdir;
+
+ VectorCopy(v->tangent, sdir);
+ VectorCopy(v->bitangent, tdir);
+
+ VectorNormalize(sdir);
+ VectorNormalize(tdir);
+
+ R_CalcTbnFromNormalAndTexDirs(v->tangent, v->bitangent, v->normal, sdir, tdir);
}
}
#endif
@@ -1060,8 +1044,8 @@ R_LoadMD3
*/
static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, const char *modName)
{
- int f, i, j, k;
-
+ int f, i, j;
+
md3Header_t *md3Model;
md3Frame_t *md3Frame;
md3Surface_t *md3Surf;
@@ -1314,70 +1298,54 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, const char *modN
#ifdef USE_VERT_TANGENT_SPACE
// calc tangent spaces
{
- // Valgrind complaints: Conditional jump or move depends on uninitialised value(s)
- // So lets Initialize them.
- const float *v0 = NULL, *v1 = NULL, *v2 = NULL;
- const float *t0 = NULL, *t1 = NULL, *t2 = NULL;
- vec3_t tangent = { 0, 0, 0 };
- vec3_t bitangent = { 0, 0, 0 };
- vec3_t normal = { 0, 0, 0 };
-
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
VectorClear(v->tangent);
VectorClear(v->bitangent);
- if (r_recalcMD3Normals->integer)
- VectorClear(v->normal);
}
for(f = 0; f < mdvModel->numFrames; f++)
{
for(j = 0, tri = surf->indexes; j < surf->numIndexes; j += 3, tri += 3)
{
- v0 = surf->verts[surf->numVerts * f + tri[0]].xyz;
- v1 = surf->verts[surf->numVerts * f + tri[1]].xyz;
- v2 = surf->verts[surf->numVerts * f + tri[2]].xyz;
+ vec3_t sdir, tdir;
+ const float *v0, *v1, *v2, *t0, *t1, *t2;
+ glIndex_t index0, index1, index2;
+
+ index0 = surf->numVerts * f + tri[0];
+ index1 = surf->numVerts * f + tri[1];
+ index2 = surf->numVerts * f + tri[2];
+
+ v0 = surf->verts[index0].xyz;
+ v1 = surf->verts[index1].xyz;
+ v2 = surf->verts[index2].xyz;
t0 = surf->st[tri[0]].st;
t1 = surf->st[tri[1]].st;
t2 = surf->st[tri[2]].st;
- if (!r_recalcMD3Normals->integer)
- VectorCopy(v->normal, normal);
- else
- VectorClear(normal);
-
- #if 1
- R_CalcTangentSpace(tangent, bitangent, normal, v0, v1, v2, t0, t1, t2);
- #else
- R_CalcNormalForTriangle(normal, v0, v1, v2);
- R_CalcTangentsForTriangle(tangent, bitangent, v0, v1, v2, t0, t1, t2);
- #endif
-
- for(k = 0; k < 3; k++)
- {
- float *v;
-
- v = surf->verts[surf->numVerts * f + tri[k]].tangent;
- VectorAdd(v, tangent, v);
-
- v = surf->verts[surf->numVerts * f + tri[k]].bitangent;
- VectorAdd(v, bitangent, v);
-
- if (r_recalcMD3Normals->integer)
- {
- v = surf->verts[surf->numVerts * f + tri[k]].normal;
- VectorAdd(v, normal, v);
- }
- }
+ R_CalcTexDirs(sdir, tdir, v0, v1, v2, t0, t1, t2);
+
+ VectorAdd(sdir, surf->verts[index0].tangent, surf->verts[index0].tangent);
+ VectorAdd(sdir, surf->verts[index1].tangent, surf->verts[index1].tangent);
+ VectorAdd(sdir, surf->verts[index2].tangent, surf->verts[index2].tangent);
+ VectorAdd(tdir, surf->verts[index0].bitangent, surf->verts[index0].bitangent);
+ VectorAdd(tdir, surf->verts[index1].bitangent, surf->verts[index1].bitangent);
+ VectorAdd(tdir, surf->verts[index2].bitangent, surf->verts[index2].bitangent);
}
}
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
- VectorNormalize(v->tangent);
- VectorNormalize(v->bitangent);
- VectorNormalize(v->normal);
+ vec3_t sdir, tdir;
+
+ VectorCopy(v->tangent, sdir);
+ VectorCopy(v->bitangent, tdir);
+
+ VectorNormalize(sdir);
+ VectorNormalize(tdir);
+
+ R_CalcTbnFromNormalAndTexDirs(v->tangent, v->bitangent, v->normal, sdir, tdir);
}
}
#endif
diff --git a/SP/code/rend2/tr_init.c b/SP/code/rend2/tr_init.c
index a167934..5c26c1d 100644
--- a/SP/code/rend2/tr_init.c
+++ b/SP/code/rend2/tr_init.c
@@ -171,7 +171,6 @@ cvar_t *r_baseNormalY;
cvar_t *r_baseParallax;
cvar_t *r_baseSpecular;
cvar_t *r_baseGloss;
-cvar_t *r_recalcMD3Normals;
cvar_t *r_mergeLightmaps;
cvar_t *r_dlightMode;
cvar_t *r_pshadowDist;
@@ -1345,7 +1344,6 @@ void R_Register( void ) {
r_baseGloss = ri.Cvar_Get( "r_baseGloss", "0.3", CVAR_ARCHIVE | CVAR_LATCH );
r_dlightMode = ri.Cvar_Get( "r_dlightMode", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_pshadowDist = ri.Cvar_Get( "r_pshadowDist", "128", CVAR_ARCHIVE );
- r_recalcMD3Normals = ri.Cvar_Get( "r_recalcMD3Normals", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_mergeLightmaps = ri.Cvar_Get( "r_mergeLightmaps", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_imageUpsample = ri.Cvar_Get( "r_imageUpsample", "0", CVAR_ARCHIVE | CVAR_LATCH );
r_imageUpsampleMaxSize = ri.Cvar_Get( "r_imageUpsampleMaxSize", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/SP/code/rend2/tr_local.h b/SP/code/rend2/tr_local.h
index 074cb60..32feb6b 100644
--- a/SP/code/rend2/tr_local.h
+++ b/SP/code/rend2/tr_local.h
@@ -2019,7 +2019,6 @@ extern cvar_t *r_baseSpecular;
extern cvar_t *r_baseGloss;
extern cvar_t *r_dlightMode;
extern cvar_t *r_pshadowDist;
-extern cvar_t *r_recalcMD3Normals;
extern cvar_t *r_mergeLightmaps;
extern cvar_t *r_imageUpsample;
extern cvar_t *r_imageUpsampleMaxSize;
@@ -2097,8 +2096,9 @@ void R_DecomposeSort( unsigned sort, int *entityNum, shader_t **shader,
void R_AddDrawSurf( surfaceType_t *surface, shader_t *shader,
int fogIndex, int dlightMap, int pshadowMap, int cubemap, int atiTess );
-void R_CalcTangentSpace(vec3_t tangent, vec3_t bitangent, vec3_t normal,
- const vec3_t v0, const vec3_t v1, const vec3_t v2, const vec2_t t0, const vec2_t t1, const vec2_t t2);
+void R_CalcTexDirs(vec3_t sdir, vec3_t tdir, const vec3_t v1, const vec3_t v2,
+ const vec3_t v3, const vec2_t w1, const vec2_t w2, const vec2_t w3);
+void R_CalcTbnFromNormalAndTexDirs(vec3_t tangent, vec3_t bitangent, vec3_t normal, vec3_t sdir, vec3_t tdir);
qboolean R_CalcTangentVectors(srfVert_t * dv[3]);
#define CULL_IN 0 // completely unclipped
diff --git a/SP/code/rend2/tr_main.c b/SP/code/rend2/tr_main.c
index 8b01b4a..815dad1 100644
--- a/SP/code/rend2/tr_main.c
+++ b/SP/code/rend2/tr_main.c
@@ -499,13 +499,11 @@ void R_CalcTangentSpaceFast(vec3_t tangent, vec3_t bitangent, vec3_t normal,
/*
http://www.terathon.com/code/tangent.html
*/
-void R_CalcTBN(vec3_t tangent, vec3_t bitangent, vec3_t normal,
- const vec3_t v1, const vec3_t v2, const vec3_t v3, const vec2_t w1, const vec2_t w2, const vec2_t w3)
+void R_CalcTexDirs(vec3_t sdir, vec3_t tdir, const vec3_t v1, const vec3_t v2,
+ const vec3_t v3, const vec2_t w1, const vec2_t w2, const vec2_t w3)
{
- vec3_t u, v;
float x1, x2, y1, y2, z1, z2;
- float s1, s2, t1, t2;
- float r, dot;
+ float s1, s2, t1, t2, r;
x1 = v2[0] - v1[0];
x2 = v3[0] - v1[0];
@@ -521,24 +519,28 @@ void R_CalcTBN(vec3_t tangent, vec3_t bitangent, vec3_t normal,
r = 1.0f / (s1 * t2 - s2 * t1);
- VectorSet(tangent, (t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r, (t2 * z1 - t1 * z2) * r);
- VectorSet(bitangent, (s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r, (s1 * z2 - s2 * z1) * r);
+ VectorSet(sdir, (t2 * x1 - t1 * x2) * r, (t2 * y1 - t1 * y2) * r, (t2 * z1 - t1 * z2) * r);
+ VectorSet(tdir, (s1 * x2 - s2 * x1) * r, (s1 * y2 - s2 * y1) * r, (s1 * z2 - s2 * z1) * r);
+}
- // compute the face normal based on vertex points
- VectorSubtract(v3, v1, u);
- VectorSubtract(v2, v1, v);
- CrossProduct(u, v, normal);
- VectorNormalize(normal);
+void R_CalcTbnFromNormalAndTexDirs(vec3_t tangent, vec3_t bitangent, vec3_t normal, vec3_t sdir, vec3_t tdir)
+{
+ vec3_t n_cross_t;
+ vec_t n_dot_t, handedness;
// Gram-Schmidt orthogonalize
- //tangent[a] = (t - n * Dot(n, t)).Normalize();
- dot = DotProduct(normal, tangent);
- VectorMA(tangent, -dot, normal, tangent);
+ n_dot_t = DotProduct(normal, sdir);
+ VectorMA(sdir, -n_dot_t, normal, tangent);
VectorNormalize(tangent);
- // B=NxT
- //CrossProduct(normal, tangent, bitangent);
+ // Calculate handedness
+ CrossProduct(normal, sdir, n_cross_t);
+ handedness = (DotProduct(n_cross_t, tdir) < 0.0f) ? -1.0f : 1.0f;
+
+ // Calculate bitangent
+ CrossProduct(normal, tangent, bitangent);
+ VectorScale(bitangent, handedness, bitangent);
}
void R_CalcTBN2(vec3_t tangent, vec3_t bitangent, vec3_t normal,
diff --git a/SP/code/rend2/tr_model.c b/SP/code/rend2/tr_model.c
index 27ccf84..3ed85c1 100644
--- a/SP/code/rend2/tr_model.c
+++ b/SP/code/rend2/tr_model.c
@@ -869,70 +869,54 @@ static qboolean R_LoadMDC( model_t *mod, int lod, void *buffer, const char *modN
#ifdef USE_VERT_TANGENT_SPACE
// calc tangent spaces
{
- // Valgrind complaints: Conditional jump or move depends on uninitialised value(s)
- // So lets Initialize them.
- const float *v0 = NULL, *v1 = NULL, *v2 = NULL;
- const float *t0 = NULL, *t1 = NULL, *t2 = NULL;
- vec3_t tangent = { 0, 0, 0 };
- vec3_t bitangent = { 0, 0, 0 };
- vec3_t normal = { 0, 0, 0 };
-
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
VectorClear(v->tangent);
VectorClear(v->bitangent);
- if (r_recalcMD3Normals->integer)
- VectorClear(v->normal);
}
for(f = 0; f < mdvModel->numFrames; f++)
{
for(j = 0, tri = surf->indexes; j < surf->numIndexes; j += 3, tri += 3)
{
- v0 = surf->verts[surf->numVerts * f + tri[0]].xyz;
- v1 = surf->verts[surf->numVerts * f + tri[1]].xyz;
- v2 = surf->verts[surf->numVerts * f + tri[2]].xyz;
+ vec3_t sdir, tdir;
+ const float *v0, *v1, *v2, *t0, *t1, *t2;
+ glIndex_t index0, index1, index2;
+
+ index0 = surf->numVerts * f + tri[0];
+ index1 = surf->numVerts * f + tri[1];
+ index2 = surf->numVerts * f + tri[2];
+
+ v0 = surf->verts[index0].xyz;
+ v1 = surf->verts[index1].xyz;
+ v2 = surf->verts[index2].xyz;
t0 = surf->st[tri[0]].st;
t1 = surf->st[tri[1]].st;
t2 = surf->st[tri[2]].st;
- if (!r_recalcMD3Normals->integer)
- VectorCopy(v->normal, normal);
- else
- VectorClear(normal);
-
- #if 1
- R_CalcTangentSpace(tangent, bitangent, normal, v0, v1, v2, t0, t1, t2);
- #else
- R_CalcNormalForTriangle(normal, v0, v1, v2);
- R_CalcTangentsForTriangle(tangent, bitangent, v0, v1, v2, t0, t1, t2);
- #endif
-
- for(k = 0; k < 3; k++)
- {
- float *v;
-
- v = surf->verts[surf->numVerts * f + tri[k]].tangent;
- VectorAdd(v, tangent, v);
-
- v = surf->verts[surf->numVerts * f + tri[k]].bitangent;
- VectorAdd(v, bitangent, v);
-
- if (r_recalcMD3Normals->integer)
- {
- v = surf->verts[surf->numVerts * f + tri[k]].normal;
- VectorAdd(v, normal, v);
- }
- }
+ R_CalcTexDirs(sdir, tdir, v0, v1, v2, t0, t1, t2);
+
+ VectorAdd(sdir, surf->verts[index0].tangent, surf->verts[index0].tangent);
+ VectorAdd(sdir, surf->verts[index1].tangent, surf->verts[index1].tangent);
+ VectorAdd(sdir, surf->verts[index2].tangent, surf->verts[index2].tangent);
+ VectorAdd(tdir, surf->verts[index0].bitangent, surf->verts[index0].bitangent);
+ VectorAdd(tdir, surf->verts[index1].bitangent, surf->verts[index1].bitangent);
+ VectorAdd(tdir, surf->verts[index2].bitangent, surf->verts[index2].bitangent);
}
}
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
- VectorNormalize(v->tangent);
- VectorNormalize(v->bitangent);
- VectorNormalize(v->normal);
+ vec3_t sdir, tdir;
+
+ VectorCopy(v->tangent, sdir);
+ VectorCopy(v->bitangent, tdir);
+
+ VectorNormalize(sdir);
+ VectorNormalize(tdir);
+
+ R_CalcTbnFromNormalAndTexDirs(v->tangent, v->bitangent, v->normal, sdir, tdir);
}
}
#endif
@@ -1062,7 +1046,7 @@ R_LoadMD3
*/
static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, const char *modName)
{
- int f, i, j, k;
+ int f, i, j;
md3Header_t *md3Model;
md3Frame_t *md3Frame;
@@ -1316,70 +1300,54 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, const char *modN
#ifdef USE_VERT_TANGENT_SPACE
// calc tangent spaces
{
- // Valgrind complaints: Conditional jump or move depends on uninitialised value(s)
- // So lets Initialize them.
- const float *v0 = NULL, *v1 = NULL, *v2 = NULL;
- const float *t0 = NULL, *t1 = NULL, *t2 = NULL;
- vec3_t tangent = { 0, 0, 0 };
- vec3_t bitangent = { 0, 0, 0 };
- vec3_t normal = { 0, 0, 0 };
-
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
VectorClear(v->tangent);
VectorClear(v->bitangent);
- if (r_recalcMD3Normals->integer)
- VectorClear(v->normal);
}
for(f = 0; f < mdvModel->numFrames; f++)
{
for(j = 0, tri = surf->indexes; j < surf->numIndexes; j += 3, tri += 3)
{
- v0 = surf->verts[surf->numVerts * f + tri[0]].xyz;
- v1 = surf->verts[surf->numVerts * f + tri[1]].xyz;
- v2 = surf->verts[surf->numVerts * f + tri[2]].xyz;
+ vec3_t sdir, tdir;
+ const float *v0, *v1, *v2, *t0, *t1, *t2;
+ glIndex_t index0, index1, index2;
+
+ index0 = surf->numVerts * f + tri[0];
+ index1 = surf->numVerts * f + tri[1];
+ index2 = surf->numVerts * f + tri[2];
+
+ v0 = surf->verts[index0].xyz;
+ v1 = surf->verts[index1].xyz;
+ v2 = surf->verts[index2].xyz;
t0 = surf->st[tri[0]].st;
t1 = surf->st[tri[1]].st;
t2 = surf->st[tri[2]].st;
- if (!r_recalcMD3Normals->integer)
- VectorCopy(v->normal, normal);
- else
- VectorClear(normal);
-
- #if 1
- R_CalcTangentSpace(tangent, bitangent, normal, v0, v1, v2, t0, t1, t2);
- #else
- R_CalcNormalForTriangle(normal, v0, v1, v2);
- R_CalcTangentsForTriangle(tangent, bitangent, v0, v1, v2, t0, t1, t2);
- #endif
-
- for(k = 0; k < 3; k++)
- {
- float *v;
-
- v = surf->verts[surf->numVerts * f + tri[k]].tangent;
- VectorAdd(v, tangent, v);
-
- v = surf->verts[surf->numVerts * f + tri[k]].bitangent;
- VectorAdd(v, bitangent, v);
-
- if (r_recalcMD3Normals->integer)
- {
- v = surf->verts[surf->numVerts * f + tri[k]].normal;
- VectorAdd(v, normal, v);
- }
- }
+ R_CalcTexDirs(sdir, tdir, v0, v1, v2, t0, t1, t2);
+
+ VectorAdd(sdir, surf->verts[index0].tangent, surf->verts[index0].tangent);
+ VectorAdd(sdir, surf->verts[index1].tangent, surf->verts[index1].tangent);
+ VectorAdd(sdir, surf->verts[index2].tangent, surf->verts[index2].tangent);
+ VectorAdd(tdir, surf->verts[index0].bitangent, surf->verts[index0].bitangent);
+ VectorAdd(tdir, surf->verts[index1].bitangent, surf->verts[index1].bitangent);
+ VectorAdd(tdir, surf->verts[index2].bitangent, surf->verts[index2].bitangent);
}
}
for(j = 0, v = surf->verts; j < (surf->numVerts * mdvModel->numFrames); j++, v++)
{
- VectorNormalize(v->tangent);
- VectorNormalize(v->bitangent);
- VectorNormalize(v->normal);
+ vec3_t sdir, tdir;
+
+ VectorCopy(v->tangent, sdir);
+ VectorCopy(v->bitangent, tdir);
+
+ VectorNormalize(sdir);
+ VectorNormalize(tdir);
+
+ R_CalcTbnFromNormalAndTexDirs(v->tangent, v->bitangent, v->normal, sdir, tdir);
}
}
#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list