Skip to content

Commit

Permalink
OpenGL2: Remove per fragment tangent space calculation code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SmileTheory
SmileTheory committed Sep 14, 2016
1 parent 4faf100 commit 8749d62
Show file tree
Hide file tree
Showing 13 changed files with 5 additions and 130 deletions.
29 changes: 0 additions & 29 deletions code/renderergl2/glsl/lightall_fp.glsl
View file
Expand Up @@ -53,14 +53,9 @@ varying vec4 var_ColorAmbient;
#endif

#if (defined(USE_LIGHT) && !defined(USE_FAST_LIGHT))
#if defined(USE_VERT_TANGENT_SPACE)
varying vec4 var_Normal;
varying vec4 var_Tangent;
varying vec4 var_Bitangent;
#else
varying vec3 var_Normal;
varying vec3 var_ViewDir;
#endif
#endif

#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
Expand Down Expand Up @@ -196,25 +191,6 @@ float CalcLightAttenuation(float point, float normDist)
return attenuation;
}

// from http://www.thetenthplanet.de/archives/1180
mat3 cotangent_frame( vec3 N, vec3 p, vec2 uv )
{
// get edge vectors of the pixel triangle
vec3 dp1 = dFdx( p );
vec3 dp2 = dFdy( p );
vec2 duv1 = dFdx( uv );
vec2 duv2 = dFdy( uv );

// solve the linear system
vec3 dp2perp = cross( dp2, N );
vec3 dp1perp = cross( N, dp1 );
vec3 T = dp2perp * duv1.x + dp1perp * duv2.x;
vec3 B = dp2perp * duv1.y + dp1perp * duv2.y;

// construct a scale-invariant frame
float invmax = inversesqrt( max( dot(T,T), dot(B,B) ) );
return mat3( T * invmax, B * invmax, N );
}

void main()
{
Expand All @@ -223,13 +199,8 @@ void main()
float NL, NH, NE, EH, attenuation;

#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_VERT_TANGENT_SPACE)
mat3 tangentToWorld = mat3(var_Tangent.xyz, var_Bitangent.xyz, var_Normal.xyz);
viewDir = vec3(var_Normal.w, var_Tangent.w, var_Bitangent.w);
#else
mat3 tangentToWorld = cotangent_frame(var_Normal, -var_ViewDir, var_TexCoords.xy);
viewDir = var_ViewDir;
#endif
E = normalize(viewDir);
#endif

Expand Down
22 changes: 4 additions & 18 deletions code/renderergl2/glsl/lightall_vp.glsl
View file
Expand Up @@ -6,16 +6,12 @@ attribute vec4 attr_Color;

attribute vec3 attr_Position;
attribute vec3 attr_Normal;
#if defined(USE_VERT_TANGENT_SPACE)
attribute vec4 attr_Tangent;
#endif

#if defined(USE_VERTEX_ANIMATION)
attribute vec3 attr_Position2;
attribute vec3 attr_Normal2;
#if defined(USE_VERT_TANGENT_SPACE)
attribute vec4 attr_Tangent2;
#endif
#endif

#if defined(USE_LIGHT) && !defined(USE_LIGHT_VECTOR)
Expand Down Expand Up @@ -74,14 +70,9 @@ varying vec4 var_ColorAmbient;
#endif

#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_VERT_TANGENT_SPACE)
varying vec4 var_Normal;
varying vec4 var_Tangent;
varying vec4 var_Bitangent;
#else
varying vec3 var_Normal;
varying vec3 var_ViewDir;
#endif
#endif

#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
Expand Down Expand Up @@ -157,13 +148,13 @@ void main()
#if defined(USE_VERTEX_ANIMATION)
vec3 position = mix(attr_Position, attr_Position2, u_VertexLerp);
vec3 normal = mix(attr_Normal, attr_Normal2, u_VertexLerp);
#if defined(USE_VERT_TANGENT_SPACE) && defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
vec3 tangent = mix(attr_Tangent.xyz, attr_Tangent2.xyz, u_VertexLerp);
#endif
#else
vec3 position = attr_Position;
vec3 normal = attr_Normal;
#if defined(USE_VERT_TANGENT_SPACE) && defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
vec3 tangent = attr_Tangent.xyz;
#endif
#endif
Expand All @@ -185,12 +176,12 @@ void main()
#if defined(USE_MODELMATRIX)
position = (u_ModelMatrix * vec4(position, 1.0)).xyz;
normal = (u_ModelMatrix * vec4(normal, 0.0)).xyz;
#if defined(USE_VERT_TANGENT_SPACE) && defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
tangent = (u_ModelMatrix * vec4(tangent, 0.0)).xyz;
#endif
#endif

#if defined(USE_VERT_TANGENT_SPACE) && defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
vec3 bitangent = cross(normal, tangent) * attr_Tangent.w;
#endif

Expand Down Expand Up @@ -247,14 +238,9 @@ void main()

#if defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
vec3 viewDir = u_ViewOrigin - position;
#if defined(USE_VERT_TANGENT_SPACE)
// store view direction in tangent space to save on varyings
var_Normal = vec4(normal, viewDir.x);
var_Tangent = vec4(tangent, viewDir.y);
var_Bitangent = vec4(bitangent, viewDir.z);
#else
var_Normal = normal;
var_ViewDir = viewDir;
#endif
#endif
}
6 changes: 0 additions & 6 deletions code/renderergl2/tr_bsp.c
View file
Expand Up @@ -809,7 +809,6 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,

surf->data = (surfaceType_t *)cv;

#ifdef USE_VERT_TANGENT_SPACE
// Calculate tangent spaces
{
srfVert_t *dv[3];
Expand All @@ -823,7 +822,6 @@ static void ParseFace( dsurface_t *ds, drawVert_t *verts, float *hdrVertColors,
R_CalcTangentVectors(dv);
}
}
#endif
}


Expand Down Expand Up @@ -963,7 +961,6 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, float *hdrVertColor
cv->numIndexes -= badTriangles * 3;
}

#ifdef USE_VERT_TANGENT_SPACE
// Calculate tangent spaces
{
srfVert_t *dv[3];
Expand All @@ -977,7 +974,6 @@ static void ParseTriSurf( dsurface_t *ds, drawVert_t *verts, float *hdrVertColor
R_CalcTangentVectors(dv);
}
}
#endif
}

/*
Expand Down Expand Up @@ -1773,9 +1769,7 @@ static int BSPSurfaceCompare(const void *a, const void *b)
static void CopyVert(const srfVert_t * in, srfVert_t * out)
{
VectorCopy(in->xyz, out->xyz);
#ifdef USE_VERT_TANGENT_SPACE
VectorCopy4(in->tangent, out->tangent);
#endif
VectorCopy4(in->normal, out->normal);
VectorCopy4(in->lightdir, out->lightdir);

Expand Down
8 changes: 0 additions & 8 deletions code/renderergl2/tr_curve.c
View file
Expand Up @@ -216,7 +216,6 @@ static int neighbors[8][2] = {
}
}

#ifdef USE_VERT_TANGENT_SPACE
static void MakeMeshTangentVectors(int width, int height, srfVert_t ctrl[MAX_GRID_SIZE][MAX_GRID_SIZE], int numIndexes,
glIndex_t indexes[(MAX_GRID_SIZE-1)*(MAX_GRID_SIZE-1)*2*3])
{
Expand Down Expand Up @@ -255,7 +254,6 @@ static void MakeMeshTangentVectors(int width, int height, srfVert_t ctrl[MAX_GRI
}
}
}
#endif


static int MakeMeshIndexes(int width, int height, glIndex_t indexes[(MAX_GRID_SIZE-1)*(MAX_GRID_SIZE-1)*2*3])
Expand Down Expand Up @@ -615,9 +613,7 @@ void R_SubdividePatchToGrid( srfBspSurface_t *grid, int width, int height,

// calculate normals
MakeMeshNormals( width, height, ctrl );
#ifdef USE_VERT_TANGENT_SPACE
MakeMeshTangentVectors(width, height, ctrl, numIndexes, indexes);
#endif

R_CreateSurfaceGridMesh(grid, width, height, ctrl, errorTable, numIndexes, indexes);
}
Expand Down Expand Up @@ -670,9 +666,7 @@ void R_GridInsertColumn( srfBspSurface_t *grid, int column, int row, vec3_t poin

// calculate normals
MakeMeshNormals( width, height, ctrl );
#ifdef USE_VERT_TANGENT_SPACE
MakeMeshTangentVectors(width, height, ctrl, numIndexes, indexes);
#endif

VectorCopy(grid->lodOrigin, lodOrigin);
lodRadius = grid->lodRadius;
Expand Down Expand Up @@ -732,9 +726,7 @@ void R_GridInsertRow( srfBspSurface_t *grid, int row, int column, vec3_t point,

// calculate normals
MakeMeshNormals( width, height, ctrl );
#ifdef USE_VERT_TANGENT_SPACE
MakeMeshTangentVectors(width, height, ctrl, numIndexes, indexes);
#endif

VectorCopy(grid->lodOrigin, lodOrigin);
lodRadius = grid->lodRadius;
Expand Down
5 changes: 0 additions & 5 deletions code/renderergl2/tr_glsl.c
View file
Expand Up @@ -1061,10 +1061,7 @@ void GLSL_InitGPUShaders(void)
{
Q_strcat(extradefines, 1024, "#define USE_NORMALMAP\n");

#ifdef USE_VERT_TANGENT_SPACE
Q_strcat(extradefines, 1024, "#define USE_VERT_TANGENT_SPACE\n");
attribs |= ATTR_TANGENT;
#endif

if ((i & LIGHTDEF_USE_PARALLAXMAP) && !(i & LIGHTDEF_ENTITY) && r_parallaxMapping->integer)
{
Expand Down Expand Up @@ -1119,12 +1116,10 @@ void GLSL_InitGPUShaders(void)
Q_strcat(extradefines, 1024, "#define USE_VERTEX_ANIMATION\n#define USE_MODELMATRIX\n");
attribs |= ATTR_POSITION2 | ATTR_NORMAL2;

#ifdef USE_VERT_TANGENT_SPACE
if (r_normalMapping->integer)
{
attribs |= ATTR_TANGENT2;
}
#endif
}

if (!GLSL_InitGPUShader(&tr.lightallShader[i], "lightall", attribs, qtrue, extradefines, qtrue, fallbackShader_lightall_vp, fallbackShader_lightall_fp))
Expand Down
12 changes: 0 additions & 12 deletions code/renderergl2/tr_local.h
View file
Expand Up @@ -55,8 +55,6 @@ typedef unsigned int glIndex_t;
#define MAX_DRAWN_PSHADOWS 16 // do not increase past 32, because bit flags are used on surfaces
#define PSHADOW_MAP_SIZE 512

#define USE_VERT_TANGENT_SPACE

typedef struct cubemap_s {
char name[MAX_QPATH];
vec3_t origin;
Expand Down Expand Up @@ -894,9 +892,7 @@ typedef struct
vec2_t st;
vec2_t lightmap;
int16_t normal[4];
#ifdef USE_VERT_TANGENT_SPACE
int16_t tangent[4];
#endif
int16_t lightdir[4];
vec4_t vertexColors;

Expand All @@ -905,11 +901,7 @@ typedef struct
#endif
} srfVert_t;

#ifdef USE_VERT_TANGENT_SPACE
#define srfVert_t_cleared(x) srfVert_t (x) = {{0, 0, 0}, {0, 0}, {0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}
#else
#define srfVert_t_cleared(x) srfVert_t (x) = {{0, 0, 0}, {0, 0}, {0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}
#endif

// srfBspSurface_t covers SF_GRID, SF_TRIANGLES, SF_POLY, and SF_VAO_MESH
typedef struct srfBspSurface_s
Expand Down Expand Up @@ -1200,9 +1192,7 @@ typedef struct
{
vec3_t xyz;
int16_t normal[4];
#ifdef USE_VERT_TANGENT_SPACE
int16_t tangent[4];
#endif
} mdvVertex_t;

typedef struct
Expand Down Expand Up @@ -2002,9 +1992,7 @@ typedef struct shaderCommands_s
glIndex_t indexes[SHADER_MAX_INDEXES] QALIGN(16);
vec4_t xyz[SHADER_MAX_VERTEXES] QALIGN(16);
int16_t normal[SHADER_MAX_VERTEXES][4] QALIGN(16);
#ifdef USE_VERT_TANGENT_SPACE
int16_t tangent[SHADER_MAX_VERTEXES][4] QALIGN(16);
#endif
vec2_t texCoords[SHADER_MAX_VERTEXES][2] QALIGN(16);
vec4_t vertexColors[SHADER_MAX_VERTEXES] QALIGN(16);
int16_t lightdir[SHADER_MAX_VERTEXES][4] QALIGN(16);
Expand Down
2 changes: 0 additions & 2 deletions code/renderergl2/tr_main.c
View file
Expand Up @@ -128,7 +128,6 @@ vec_t R_CalcTangentSpace(vec3_t tangent, vec3_t bitangent, const vec3_t normal,
return handedness;
}

#ifdef USE_VERT_TANGENT_SPACE
qboolean R_CalcTangentVectors(srfVert_t * dv[3])
{
int i;
Expand Down Expand Up @@ -189,7 +188,6 @@ qboolean R_CalcTangentVectors(srfVert_t * dv[3])

return qtrue;
}
#endif


/*
Expand Down
14 changes: 0 additions & 14 deletions code/renderergl2/tr_model.c
View file
Expand Up @@ -598,7 +598,6 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
st->st[1] = LittleFloat(md3st->st[1]);
}

#ifdef USE_VERT_TANGENT_SPACE
// calc tangent spaces
{
vec3_t *sdirs = ri.Malloc(sizeof(*sdirs) * surf->numVerts * mdvModel->numFrames);
Expand Down Expand Up @@ -659,7 +658,6 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
ri.Free(sdirs);
ri.Free(tdirs);
}
#endif

// find the next surface
md3Surf = (md3Surface_t *) ((byte *) md3Surf + md3Surf->ofsEnd);
Expand Down Expand Up @@ -690,9 +688,7 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
offset_tangent = offset_normal + sizeof(int16_t) * 4;
stride_st = glRefConfig.packedTexcoordDataSize;
stride_xyz = sizeof(vec3_t) + sizeof(int16_t) * 4;
#ifdef USE_VERT_TANGENT_SPACE
stride_xyz += sizeof(int16_t) * 4;
#endif
stride_normal = stride_tangent = stride_xyz;

dataSize = offset_xyz + surf->numVerts * mdvModel->numFrames * stride_xyz;
Expand All @@ -704,11 +700,7 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
offset_st = offset_xyz + sizeof(vec3_t);
offset_normal = offset_st + glRefConfig.packedTexcoordDataSize;
offset_tangent = offset_normal + sizeof(int16_t) * 4;
#ifdef USE_VERT_TANGENT_SPACE
stride_xyz = offset_tangent + sizeof(int16_t) * 4;
#else
stride_xyz = offset_normal + sizeof(int16_t) * 4;
#endif
stride_st = stride_normal = stride_tangent = stride_xyz;

dataSize = surf->numVerts * stride_xyz;
Expand Down Expand Up @@ -736,11 +728,9 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
memcpy(data + dataOfs, &v->normal, sizeof(int16_t) * 4);
dataOfs += sizeof(int16_t) * 4;

#ifdef USE_VERT_TANGENT_SPACE
// tangent
memcpy(data + dataOfs, &v->tangent, sizeof(int16_t) * 4);
dataOfs += sizeof(int16_t) * 4;
#endif
}
}
else
Expand All @@ -760,11 +750,9 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
memcpy(data + dataOfs, &v->normal, sizeof(int16_t) * 4);
dataOfs += sizeof(int16_t) * 4;

#ifdef USE_VERT_TANGENT_SPACE
// tangent
memcpy(data + dataOfs, &v->tangent, sizeof(int16_t) * 4);
dataOfs += sizeof(int16_t) * 4;
#endif
}
}

Expand All @@ -782,9 +770,7 @@ static qboolean R_LoadMD3(model_t * mod, int lod, void *buffer, int bufferSize,
vaoSurf->vao->attribs[ATTR_INDEX_POSITION].enabled = 1;
vaoSurf->vao->attribs[ATTR_INDEX_TEXCOORD].enabled = 1;
vaoSurf->vao->attribs[ATTR_INDEX_NORMAL ].enabled = 1;
#ifdef USE_VERT_TANGENT_SPACE
vaoSurf->vao->attribs[ATTR_INDEX_TANGENT ].enabled = 1;
#endif

vaoSurf->vao->attribs[ATTR_INDEX_POSITION].count = 3;
vaoSurf->vao->attribs[ATTR_INDEX_TEXCOORD].count = 2;
Expand Down

0 comments on commit 8749d62

Please sign in to comment.