Moderators: winston, another_commander
Don't you just love the octarine words dancing in the air?DaddyHoggy wrote:I don't understand hardly any of this and yet find it completely compelling at the same time...
Hmmm. This reads to me as if the package is available already, but I was unable to find it. Did I get it wrong or have I been too blind to find it?Simon B wrote:The method used to produce the oldships.oxp set was pretty formulaic - only the cat and salamander do not use the formula.
If you want to use this set but worry that your fav ship will clash (or you have an oxp you want to modify to fit in... or you just want to be able to model: have a look.)
Code: Select all
[shader.link.failure]: ***** GLSL shader linking failed:
>>>>> GLSL log:
Fragment info
-------------
(111) : warning C7011: implicit cast from "vec4" to "vec3"
(111) : warning C7011: implicit cast from "vec4" to "vec3"
(111) : warning C7011: implicit cast from "vec4" to "vec3"
(111) : warning C7011: implicit cast from "vec4" to "vec3"
(111) : warning C7011: implicit cast from "vec4" to "vec3"
(111) : error C1035: assignment of incompatible types
(111) : error C5210: assignment among incompatible concrete types
(0) : fatal error C9999: unable to generate code, no legal types for program.
Code: Select all
// Information from Oolite.
uniform sampler2D uColorMap; // Diffuse and Specular Intensity map
uniform sampler2D uFXMap; // Effects & Light Illumination Map
uniform sampler2D uNormalMap; // Normal Map
const float specExponent = 5.0;
uniform vec3 SpecularRGB;
uniform float time;
uniform float eng_pow;
uniform float hull_heat;
// Information from vertex shader.
varying vec2 vTexCoord;
varying vec3 vEyeVector; // These are all in tangent space
varying vec3 vLight0Vector;
varying vec3 vLight1Vector;
// redGlow effect
vec4 redGlow(float level)
{
vec4 result;
result.rgb = vec3(1.9, 0.5, 0.2) * level * 2.0;
result.a = 1.0;
return result;
}
// EngineGlow effect
vec4 EngineGlow(float level)
{
vec4 result;
result.rgb = vec3(1.9, 0.5, 0.20) * level;
result.a = 1.0;
return result;
}
void Light(in vec3 lightVector, in vec3 normal, in vec4 lightColor, in vec3 eyeVector,
in float specExponent, inout vec4 totalDiffuse, inout vec4 totalSpecular)
{
lightVector = normalize(lightVector);
vec3 reflection = normalize(-reflect(lightVector, normal));
totalDiffuse += gl_FrontMaterial.diffuse * lightColor * max(dot(normal, lightVector), 0.0);
totalSpecular += lightColor * pow(max(dot(reflection, eyeVector), 0.0), specExponent);
}
#ifdef OO_REDUCED_COMPLEXITY
#define Pulse(v, ts) ((v) * 0.95)
#else
// Irregular flickering function.
float Pulse(float value, float timeScale)
{
float t = time * timeScale;
float s0 = t;
s0 -= floor(s0);
float sum = abs( s0 - 0.5);
float s1 = t * 0.7 - 0.05;
s1 -= floor(s1);
sum += abs(s1 - 0.5) - 0.25;
float s2 = t * 1.3 - 0.3;
s2 -= floor(s2);
sum += abs(s2 - 0.5) - 0.25;
float s3 = t * 5.09 - 0.6;
s3 -= floor(s3);
sum += abs(s3 - 0.5) - 0.25;
return (sum * 0.1 + 0.9) * value;
}
#endif
// Calculate the contribution of a single light. Ought to be a function, but OS X's GLSlang implementation isn't sufficiently clever.
#define LIGHT(idx, vector) Light(vector, normal, gl_LightSource[idx].diffuse, eyeVector, specExponent, diffuse, specular)
void main()
{
vec4 diffuse = vec4(0.0), specular = vec4(0);
vec3 eyeVector = normalize(vEyeVector);
vec2 texCoord = vTexCoord;
// Load texture data
vec4 colorMap = texture2D(uColorMap, texCoord);
vec4 fxMap = texture2D(uFXMap, texCoord);
vec3 normal = normalize( texture2D(uNormalMap, texCoord).xyz - 0.5);
normal = normalize(normal);
float specIntensity = 15.0 * colorMap.a * colorMap.a;
#ifdef OO_LIGHT_0_FIX
LIGHT(0, normalize(vLight0Vector));
#endif
LIGHT(1, normalize(vLight1Vector)); // change the 0 to 1 when exporting back to oolite
diffuse += gl_FrontMaterial.ambient * gl_LightSource[0].ambient;
diffuse += fxMap.a; // use fxmap alpha channel as an illumination map
vec4 color = diffuse * colorMap;
color += redGlow(fxMap.b * Pulse(min(eng_pow, 1.0), 1.0)); // adds red 'engine heat' glow
color += EngineGlow(fxMap.r * eng_pow); // adds orange/red exhaust-vent glow
// calculate the specular, colour it using a weighted sum of diffuse map and imported color
color += 3.0 * ((0.7*SpecularRGB)+(0.3*colorMap)) * specular * specIntensity;
color.a = 1.0;
gl_FragColor = color;
}
Actually, implicit casts are illegal and those warnings should be errors. Typically you want vec3 x = y.rgb (or equivalently y.xyz).Simon B wrote:The warnings tell me that I have a vec3 = vec4, 5 times. But the machine can cope with it - presumably by dropping the last component.
Code: Select all
color += 3.0 * ((0.7*SpecularRGB)+(0.3*colorMap)) * specular * specIntensity;Code: Select all
uniforms =
{
uColourMap = { type = texture; value = 0; };
uFXMap = { type = texture; value = 1; };
uNormalMap = { type = texture; value = 1; };Code: Select all
// EngineGlow effect
vec4 EngineGlow(float level)
{
return vec4(vec3(0.9, 0.5, 0.2) * level, 0);
}Code: Select all
void main()
{
vec4 diffuse = vec4(0.0), specular = vec4(0);
vec3 eyeVector = normalize(vEyeVector);
vec2 texCoord = vTexCoord;
// Load texture data
vec4 colorMap = texture2D(uColorMap, texCoord);
vec4 fxMap = texture2D(uFXMap, texCoord);
vec3 normal = normalize( texture2D(uNormalMap, texCoord).xyz - 0.5);
normal = normalize(normal);
float specIntensity = 0.5 * colorMap.a * colorMap.a;
#ifdef OO_LIGHT_0_FIX
LIGHT(0, normalize(vLight0Vector));
#endif
LIGHT(1, normalize(vLight1Vector)); // change the 0 to 1 when exporting back to oolite
diffuse += gl_FrontMaterial.ambient * gl_LightSource[0].ambient;
//diffuse += fxMap.a; // use fxmap alpha channel as an illumination map
specular = mix(specular * SpecularRGB, specular * colorMap, 0.0); // Adds the Specular Effect
// Add in constant glow (blue on effects map)
diffuse += fxMap.b;
// Apply part of engine effect before applying colour, so it is partially texture-dependant
float engineAlpha = fxMap.r;
vec4 engineEffect = engineAlpha * EngineGlow(min(uEngineLevel, 1.0));
diffuse += 0.4 * engineEffect;
vec4 color = diffuse * colorMap + specular * specIntensity;
// Apply rest of engine effect
color += 0.6 * engineEffect;
// ...and heat effects
float hullHeat;
hullHeat = max(uHullHeatLevel - 0.5, 0.0) * 2.0;
hullHeat = Pulse(hullHeat * hullHeat, 0.1);
color += redGlow(hullHeat);
color.a = 1.0;
gl_FragColor = color;
}
That looks a bit wrong – the FX map and normal map are mapped to the same texture. If you’ve copied that, it’d explain why the effects aren’t working as expected…Simon B wrote:I notice the griff boa has things like... in the uniforms - dunno why and adding them makes not a snot of difference.Code: Select all
uniforms = { uColourMap = { type = texture; value = 0; }; uFXMap = { type = texture; value = 1; }; uNormalMap = { type = texture; value = 1; };
Er… you can’t put an OXP inside an OXP. :-) (People generally shouldn’t be expected to look inside a folder named foo.oxp to find the OXP hiding in it, and on Mac OS X it looks like a file.)Simon B wrote:Neolite Companion
... this is now ready for perusal. (hint: click the title...)
There really is no stopping you, is there?Simon B wrote:I'd like to have a go at the ships built-in to random hits and navy ...
Ah - the value part is an index - that makes sense now ... of course had I actually read the specification, I'd know that ... but that would be... reading ... the ... instructions ... and where's the fun in that?Ahruman wrote:That looks a bit wrong – the FX map and normal map are mapped to the same texture. If you’ve copied that, it’d explain why the effects aren’t working as expected…
But ... I didn't. The file linked to isEr… you can’t put an OXP inside an OXP. :-) (People generally shouldn’t be expected to look inside a folder named foo.oxp to find the OXP hiding in it, and on Mac OS X it looks like a file.)
grrr... there's always something ... autocrop and resave that png will fix that - it doesn't throw the texture off in the preview.Er… you can’t put an OXP inside an OXP. :-) (People generally shouldn’t be expected to look inside a folder named foo.oxp to find the OXP hiding in it, and on Mac OS X it looks like a file.)
Oh sure - there's always money and sex... from you I'll take cash.ovvldc wrote:There really is no stopping you, is there? 8)Simon B wrote:I'd like to have a go at the ships built-in to random hits and navy ...
So far the Mussurana is a one-off and I hesitate to ask the board where best to put it because that may be a bit tempting ;)
I think it would be best to replace ships on a per-oxp basis, so that players can make a clean switch...
The trouble with this project is that it affects a lot of other add-ons.
I am a bit fuzzy on whether you want to do with the Behemoth, Military Fiasco (Navy stuff), Murgh's X-ships (used in Military Fiasco), Python Class Cruiser and/or maybe the Mpack rusties.
In the pipeline - it would be appropriate to have a few chosen ships appearing in as-new condition at a higher price but otherwise no different. There is a pristine model FDL in the pipline...It could be nice to have really shiny versions, the slightly smudged ones that you made and some really rusty and downspecced versions.
I can do a lot with the shine - yes :DThe visual difference should be in the paint textures only, not in normals maps or other stuff (perhaps scale up the shine on the pristine versions and scale down the shine on the rusties)..
