[Swifty]

This doesn't require another render pass. It's just another few lines in the fragment shader.

[Fury]

I've been too long away from FSO modding because the only thing I noticed is that how low-res those textures are.

[Black Wolf]

Swifty: Does it need a -height map? Or does it somehow extract that data from the -normal map?

[The E]

Save your height maps, lads!

The DL of mod and shader as they are now. May be changed in the future, but not much. That's only 9 lines of shader added :p
http://www.mediafire.com/download/25mktp3rbcuv0an/Parallax.rar

Fantastic work that. Small change from me:

main-f.sdr:

Code: [Select]

#ifdef FLAG_LIGHT
uniform int n_lights;
#endif
#ifdef FLAG_DIFFUSE_MAP
uniform sampler2D sBasemap;
uniform int desaturate;
uniform float desaturate_r;
uniform float desaturate_g;
uniform float desaturate_b;
#endif
#ifdef FLAG_GLOW_MAP
uniform sampler2D sGlowmap;
#endif
#ifdef FLAG_SPEC_MAP
uniform sampler2D sSpecmap;
#endif
#ifdef FLAG_ENV_MAP
uniform samplerCube sEnvmap;
uniform bool alpha_spec;
varying vec3 envReflect;
#endif
#ifdef FLAG_NORMAL_MAP
uniform sampler2D sNormalmap;
#endif
#ifdef FLAG_HEIGHT_MAP
uniform sampler2D sHeightmap;
#endif

#if defined FLAG_NORMAL_MAP || defined FLAG_HEIGHT_MAP
varying mat3 tbnMatrix;
#endif

#ifdef FLAG_FOG
varying float fogDist;
#endif
#ifdef FLAG_ANIMATED
uniform sampler2D sFramebuffer;
uniform int effect_num;
uniform float anim_timer;
uniform float vpwidth;
uniform float vpheight;
#endif
#ifdef FLAG_TEAMCOLOR
uniform vec3 base_color;
uniform vec3 stripe_color;
vec2 teamMask = vec2(0.0, 0.0);
#endif
#ifdef FLAG_MISC_MAP
uniform sampler2D sMiscmap;
#endif
varying vec4 position;
varying vec3 lNormal;
#if SHADER_MODEL == 2
  #define MAX_LIGHTS 2
#else
  #define MAX_LIGHTS 8
#endif
#define SPEC_INTENSITY_POINT 1.0 // Point light
#define SPEC_INTENSITY_DIRECTIONAL 1.0 // Directional light
#define SPECULAR_FACTOR 1.0
#define SPECULAR_ALPHA 0.1
#define SPEC_FACTOR_NO_SPEC_MAP 0.6
#define ENV_ALPHA_FACTOR 0.3
#define GLOW_MAP_INTENSITY 1.0
#define AMBIENT_LIGHT_BOOST 1.0
#define HEIGHT_SCALE 0.02
void main()
{
vec3 eyeDir = vec3(normalize(-position).xyz); // Camera is as (0,0,0) in ModelView space
vec4 lightAmbientDiffuse = vec4(0.0, 0.0, 0.0, 1.0);
vec4 lightDiffuse = vec4(0.0, 0.0, 0.0, 1.0);
vec4 lightAmbient = vec4(0.0, 0.0, 0.0, 1.0);
vec4 lightSpecular = vec4(0.0, 0.0, 0.0, 1.0);
vec2 texCoord = gl_TexCoord[0].xy;
  #ifdef FLAG_HEIGHT_MAP
  float height = texture2D(sHeightmap, texCoord).g;
  height = HEIGHT_SCALE * height - (HEIGHT_SCALE / 2.0f);
  texCoord = texCoord + height * (transpose(tbnMatrix) * eyeDir).xy;
  #endif
 #ifdef FLAG_SPEC_MAP
vec4 specColour = texture2D(sSpecmap, texCoord);
 #endif
 float gloss = gl_FrontMaterial.shininess;
 #ifdef FLAG_MISC_MAP
   #ifdef FLAG_TEAMCOLOR
    vec2 teamMask = vec2(0.0, 0.0);
    teamMask = texture2D(sMiscmap, texCoord).rg;
   #endif
 #endif
 #ifdef FLAG_LIGHT
  #ifdef FLAG_NORMAL_MAP
// Normal map - convert from DXT5nm
vec3 normal;
normal.rg = (texture2D(sNormalmap, texCoord).ag * 2.0) - 1.0;
   #ifdef FLAG_ENV_MAP
vec3 envOffset = vec3(0.0);
envOffset.xy = normal.xy;
vec3 envReflectNM = envReflect + envOffset;
vec4 envColour = textureCube(sEnvmap, envReflectNM);
   #endif
normal.b = sqrt(1.0 - dot(normal.rg, normal.rg));
normal = tbnMatrix * normal;
float norm = length(normal);
// prevent breaking of normal maps
if (length(normal) > 0.0)
normal /= norm;
else
normal = tbnMatrix * vec3(0.0, 0.0, 1.0);
  #else
vec3 normal = lNormal;
   #ifdef FLAG_ENV_MAP
vec4 envColour = textureCube(sEnvmap, envReflect);
   #endif
  #endif
vec3 lightDir;
lightAmbient = gl_FrontMaterial.emission + (gl_LightModel.ambient * gl_FrontMaterial.ambient);
float dist;
#pragma optionNV unroll all
for (int i = 0; i < MAX_LIGHTS; ++i) {
  #if SHADER_MODEL > 2
if (i > n_lights)
break;
  #endif
float specularIntensity = 1.0;
float attenuation = 1.0;
// Attenuation and light direction
  #if SHADER_MODEL > 2
if (gl_LightSource[i].position.w == 1.0) {
  #else
if (gl_LightSource[i].position.w == 1.0 && i != 0) {
  #endif
// Positional light source
dist = distance(gl_LightSource[i].position.xyz, position.xyz);
lightDir = (gl_LightSource[i].position.xyz - position.xyz);
  #if SHADER_MODEL > 2
if (gl_LightSource[i].spotCutoff < 91.0) {  // Tube light
float beamlength = length(gl_LightSource[i].spotDirection);
vec3 beamDir = normalize(gl_LightSource[i].spotDirection);
// Get nearest point on line
float neardist = dot(position.xyz - gl_LightSource[i].position.xyz , beamDir);
// Move back from the endpoint of the beam along the beam by the distance we calculated
vec3 nearest = gl_LightSource[i].position.xyz - beamDir * abs(neardist);
lightDir = nearest - position.xyz;
dist = length(lightDir);
}
  #endif
lightDir = normalize(lightDir);
attenuation = 1.0 / (gl_LightSource[i].constantAttenuation + (gl_LightSource[i].linearAttenuation * dist) + (gl_LightSource[i].quadraticAttenuation * dist * dist));
specularIntensity = SPEC_INTENSITY_POINT;
} else {
// Directional light source
lightDir = normalize(gl_LightSource[i].position.xyz);
specularIntensity = SPEC_INTENSITY_DIRECTIONAL;
}
vec3 half_vec = normalize(lightDir + eyeDir);
// Ambient and Diffuse
lightAmbient += (gl_FrontLightProduct[i].ambient * attenuation);
lightDiffuse += (gl_FrontLightProduct[i].diffuse * (max(dot(normal, lightDir), 0.0)) * attenuation);
// Specular
float NdotHV = clamp(dot(normal, half_vec), 0.0, 1.0);
lightSpecular += (((gl_FrontLightProduct[i].specular * pow(NdotHV, gloss)) * attenuation) * specularIntensity) * ( (gloss/8.0) + (2.0/8.0) );
}
lightAmbientDiffuse = lightAmbient + lightDiffuse;
 #else
lightAmbientDiffuse = gl_Color;
lightSpecular = gl_SecondaryColor;
 #endif
 #ifdef FLAG_ANIMATED
vec2 distort = vec2(cos(position.x*position.w*0.005+anim_timer*20.0)*sin(position.y*position.w*0.005),sin(position.x*position.w*0.005+anim_timer*20.0)*cos(position.y*position.w*0.005))*0.03;
 #endif
 // Base color
 #ifdef FLAG_DIFFUSE_MAP
  #ifdef FLAG_ANIMATED
vec4 baseColor;
if (effect_num == 2) {
baseColor = texture2D(sBasemap, texCoord + distort*(1.0-anim_timer));
} else {
baseColor = texture2D(sBasemap, texCoord);
}
  #else
vec4 baseColor = texture2D(sBasemap, texCoord);
  #endif
 #else
vec4 baseColor = gl_Color;
 #endif
  #ifdef FLAG_TEAMCOLOR
vec3 base = base_color - vec3(0.5);
vec3 stripe = stripe_color - vec3(0.5);
baseColor.rgb += (base * teamMask.x) + (stripe * teamMask.y);
  #endif
vec4 fragmentColor;
fragmentColor.rgb = baseColor.rgb * max(lightAmbientDiffuse.rgb * AMBIENT_LIGHT_BOOST, gl_LightModel.ambient.rgb - 0.425);
fragmentColor.a = baseColor.a;
 // Spec color
 #ifdef FLAG_SPEC_MAP
fragmentColor.rgb += lightSpecular.rgb * (specColour.rgb * SPECULAR_FACTOR);
fragmentColor.a += (dot(lightSpecular.a, lightSpecular.a) * SPECULAR_ALPHA);
 #else
fragmentColor.rgb += lightSpecular.rgb * (baseColor.rgb * SPEC_FACTOR_NO_SPEC_MAP);
 #endif
 // Env color
 #ifdef FLAG_ENV_MAP
vec3 envIntensity = (alpha_spec) ? vec3(specColour.a) : specColour.rgb;
fragmentColor.a += (dot(envColour.rgb, envColour.rgb) * ENV_ALPHA_FACTOR);
fragmentColor.rgb += envColour.rgb * envIntensity;
 #endif
 // Glow color
 #ifdef FLAG_GLOW_MAP
// vec3 glowColour = texture2D(sGlowmap, texCoord).rgb;
// fragmentColor.rgb += glowColour.rgb * GLOW_MAP_INTENSITY;
fragmentColor.rgb += texture2D(sGlowmap, texCoord).rgb * GLOW_MAP_INTENSITY;
 #endif
 #ifdef FLAG_FOG
fragmentColor.rgb = mix(fragmentColor.rgb, gl_Fog.color.rgb, fogDist);
 #endif
 #ifdef FLAG_ANIMATED
if (effect_num == 0) {
float shinefactor = 1.0/(1.0 + pow((fract(abs(gl_TexCoord[0].x))-anim_timer) * 1000.0, 2.0)) * 1000.0;
gl_FragColor.rgb = fragmentColor.rgb + vec3(shinefactor);
gl_FragColor.a = fragmentColor.a * clamp(shinefactor * (fract(abs(gl_TexCoord[0].x))-anim_timer) * -10000.0,0.0,1.0);
}
if (effect_num == 1) {
float shinefactor = 1.0/(1.0 + pow((position.y-anim_timer), 2.0));
gl_FragColor.rgb = fragmentColor.rgb + vec3(shinefactor);
#ifdef FLAG_LIGHT
gl_FragColor.a = fragmentColor.a;
#else
// ATI Wireframe fix *grumble*
gl_FragColor.a = clamp((position.y-anim_timer) * 10000.0,0.0,1.0);
#endif
}
if (effect_num == 2) {
vec2 screenPos = gl_FragCoord.xy * vec2(vpwidth,vpheight);
gl_FragColor.a = fragmentColor.a;
float cloak_interp = (sin(position.x*position.w*0.005+anim_timer*20.0)*sin(position.y*position.w*0.005)*0.5)-0.5;
#ifdef FLAG_LIGHT
gl_FragColor.rgb = mix(texture2D(sFramebuffer, screenPos + distort*anim_timer + anim_timer*0.1*normal.xy).rgb,fragmentColor.rgb,clamp(cloak_interp+anim_timer*2.0,0.0,1.0));
#else
gl_FragColor.rgb = mix(texture2D(sFramebuffer, screenPos + distort*anim_timer + anim_timer*0.1*lNormal.xy).rgb,fragmentColor.rgb,clamp(cloak_interp+anim_timer*2.0,0.0,1.0));
#endif
}
 #else
#ifdef FLAG_DIFFUSE_MAP
if(desaturate == 1) {
float intensity = 0.0;
intensity = (fragmentColor.r + fragmentColor.g + fragmentColor.b)/3.0;
float alpha = fragmentColor.a;
fragmentColor = vec4(desaturate_r, desaturate_g, desaturate_b, 1.0) * intensity;
fragmentColor.a = alpha;
}
#endif
gl_FragColor = fragmentColor;
 #endif
}
main-v.sdr:

Code: [Select]

#ifdef FLAG_ENV_MAP
uniform mat4 envMatrix;
varying vec3 envReflect;
#endif
#if defined FLAG_NORMAL_MAP || defined FLAG_HEIGHT_MAP
varying mat3 tbnMatrix;
#endif
#ifdef FLAG_FOG
varying float fogDist;
#endif
#ifdef FLAG_THRUSTER
uniform float thruster_scale;
#endif
varying vec4 position;
varying vec3 lNormal;
void main()
{
gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
vec4 vertex = gl_Vertex;
 #ifdef FLAG_THRUSTER
if(vertex.z < -1.5) {
vertex.z *= thruster_scale;
}
 #endif
gl_Position = gl_ProjectionMatrix * gl_ModelViewMatrix * vertex;
gl_FrontColor = gl_Color;
gl_FrontSecondaryColor = vec4(0.0, 0.0, 0.0, 1.0);
 // Transform the normal into eye space and normalize the result.
position = gl_ModelViewMatrix * vertex;
vec3 normal = normalize(gl_NormalMatrix * gl_Normal);
lNormal = normal;
 #if defined FLAG_NORMAL_MAP || defined FLAG_HEIGHT_MAP
 // Setup stuff for normal maps
vec3 t = normalize(gl_NormalMatrix * gl_MultiTexCoord1.xyz);
vec3 b = cross(normal, t) * gl_MultiTexCoord1.w;
tbnMatrix = mat3(t, b, normal);
 #endif
 #ifdef FLAG_ENV_MAP
 // Environment mapping reflection vector.
envReflect = reflect(position.xyz, normal);
envReflect = vec3(envMatrix * vec4(envReflect, 0.0));
envReflect = normalize(envReflect);
 #endif
 #ifdef FLAG_FOG
fogDist = clamp((gl_Position.z - gl_Fog.start) * 0.75 * gl_Fog.scale, 0.0, 1.0);
 #endif
gl_ClipVertex = (gl_ModelViewMatrix * vertex);
}
These shaders allow normal maps and height maps to exist independently. In your shaders, height maps needed normal maps in order to work (or rather, a specific step the vertex shader did when normal maps were active). I've changed both shaders so that the tbnMatrix is computed whenever normal mapping or height mapping is active.

Swifty: Does it need a -height map? Or does it somehow extract that data from the -normal map?

Yes, it does, and while you technically could reverse-engineer the height map from the normal map via some fancy math tricks, making a separate height map is recommended. If you're following Herra's GIMP tutorial, a height map is a first step to making a normal map anyway.

I should also note that you definitely need both a height and a normal map, as the height map on its own does not provide enough information to tell the shader where to put specular highlights.


EDIT: Here is (or will be, rather) a video showing how normal and height maps work together:

[FreeSpaceFreak]

Didn't we have heightmapping at some point, which was subsequently dropped again?

[headdie]

Didn't we have heightmapping at some point, which was subsequently dropped again?

I believe it was dropped in favour of normal maps

[Alan Bolte]

EDIT: Here is (or will be, rather) a video showing how normal and height maps work together:

There's something wrong there, I don't know if it's the code or the height map used. If you watch the top of the sphere, where there are a bunch of square grey shapes on a black background, they look like they're... I don't know, I want to say "swimming" whenever height maps are turned on.

[Kobrar44]

Yes they were. Reson for that is that the algorithms visually bumps everything with height > 0.5 [128] and insets with height < 0.5. Heightmap for Karnak wasn't properly scaled [swimming parts were well below 0.5] and I fixed that already. I'll upload everything once I'm satisfied with parallax occlusion too.

[NeonShivan]

Who knew alien invasions are so beautiful.

[Droid803]

That's a pretty planet.

[An4ximandros]

Oh no! The Ceph have succeeded in freezing Earth. Prophet has failed us. (Nice Planet.)

EDIT: I just remembered that a long time ago, Aesaar said the Neo-Raynor would not be shown until the release of the new BP part. Did you change your mind or... is... IS IT HAPPENING?!

[Aesaar]

I changed my mind.  Now it's not going to be released until it's actually done, which it isn't (also my own personal whims).  No lods or debris yet, and textures aren't quite done either.

Maybe I should torment you and make you wait until the Titan...

[BritishShivans]

Goddamnit, An4ximandros. Now he'll never release it. 

[NeonShivan]

Maybe I should torment you and make you wait until the Titan...

Please do

[The Dagger]

Who knew alien invasions are so beautiful.

*** Pretty pictures ***

Wow, that planet looks gorgeous. Can we have it?

[NeonShivan]

Who knew alien invasions are so beautiful.

*** Pretty pictures ***

Wow, that planet looks gorgeous. Can we have it?

Sure! If you take the effort to grab it from Shadow Genesis, cause that's where the planet came from

EDIT: The file is called "hab2"

Whether or not Shadow Genesis is willing to allow others to use it is an entirely different story however. I'm using it for screenshot purposes at this moment but if they don't want it distributed in other mods, then I'll remove it and then yeah...you sadly you can't use it either but hey, why would they deny you access to such a beautiful piece of artwork.

[The Dagger]

Well, Shadow Genesis is in my TODO list . But it keeps getting larger and larger.

[Nyctaeus]

You can use everything from Shadow Genesis on the same conditions as every public avaliable content. This planet is a stock from the depths of the internet , with citylights by me. Is wasn't even used in the first release.
Cool stuff "yes"

[Nyctaeus]

Just wanted to show something up . Recently finished - the Factory Ship escorted by the frigate. Base model by SolCommand [http://www.solcommand.com/2013/09/mccv-2.html]. Special thanks for Scooby for hangarbay model.



And yeah, I still suck at making normals... So here is a clear shot without.

[Droid803]

Something about that shine map makes the yellow paint look very...faded?
Cool ship though!