Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-30 08:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dashboard): flair tints and Basic lighting as the client computes them

Browse Source 
- Flair tints are the terrain file's color bytes over 255, times the flair
  model's own vertex colors (FlairAssets::AppendRenderBuffer divides by
  255.0). The manifests said 63, so in the game shaders' sRGB maths tints
  of up to 4 turned the flairs white (Battle Against Frakjaw's leaves).
  Conversion format 6, so flair manifests kept by browsers are fetched
  again.
- BasicShaders, AlphaAsAlpha and Flair.fx multiply the light by the vertex
  color and only then clamp, as the COLOR0 output; the views clamped the
  light first, so a light brighter than 1 no longer lifted darker vertex
  colors.
- Docs: the flair tint, the clamp, and that AlphaAsAlpha cards show their
  backs (Cullmode none) from outside a playable area.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-28 16:31:12 -05:00
parent 4bd34dc087
commit 93f4b051c6
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dDashboardServer/static/js/game-shaders.js
View File

@@ -32,6 +32,7 @@ varying vec2 vUvDark;
varying vec2 vUv;
varying vec4 vColor;
varying vec3 vLight; // the lit color the technique's vertex shader outputs (clamped as a COLOR output is)
varying vec3 vLit; // ... times the vertex color, clamped once as the Basic, AlphaAsAlpha and Flair COLOR0 outputs are
varying float vLdn; // N.L, clamped
varying vec3 vNormal; // world space
varying vec3 vWorld;
@@ -92,11 +93,21 @@ void main() {
// g_metalDiffuse * N.L^4 + g_metalAmbient
vLight = clamp( vec3( 0.7 ) * pow( vLdn, 4.0 ) + vec3( 0.3 ), 0.0, 1.0 );
#elif defined( FAMILY_FLAIR )
// Flair_VS: (0.85 * sun + ambient) * the flair's tint, clamped once as the COLOR0 output
vLight = clamp( 0.85 * gameLightColor + gameAmbient, 0.0, 1.0 );
vLit = clamp( ( 0.85 * gameLightColor + gameAmbient ) * vcol.rgb, 0.0, 1.0 );
#elif defined( UNLIT )
vLight = vec3( 1.0 );
vLit = clamp( vcol.rgb, 0.0, 1.0 );
#else
vLight = clamp( max( vec3( 0.0 ), gameLightColor * ldn ) + gameAmbient, 0.0, 1.0 );
// BasicShaders / AlphaAsAlpha *_Lighting_VertColor_VS: (sun * N.L + ambient) * the vertex color, then clamped as
// the COLOR0 output (not the light alone: a bright light still lifts a dark vertex color)
vec3 lit = max( vec3( 0.0 ), gameLightColor * ldn ) + gameAmbient;
vLight = clamp( lit, 0.0, 1.0 );
vLit = clamp( lit * vcol.rgb, 0.0, 1.0 );
#endif
#if !defined( FAMILY_FLAIR ) && !defined( FAMILY_BASIC )
vLit = vLight * vcol.rgb;
#endif
gl_Position = projectionMatrix * viewMatrix * worldPosition;
}
@@ -128,6 +139,7 @@ varying vec2 vUvDark;
#endif
varying vec4 vColor;
varying vec3 vLight;
varying vec3 vLit;
varying float vLdn;
varying vec3 vNormal;
varying vec3 vWorld;
@@ -309,7 +321,7 @@ void main() {
#else
// Basic, AlphaAsAlpha, fixed function, flairs, the sky: texture times the lit (or unlit) vertex color
vec4 light = vec4( vLight * vc.rgb, vc.a );
vec4 light = vec4( vLit, vc.a );
#ifdef LAYERS_BLENDED
result = vec4( mix( tex( darkMap, vUvDark ).rgb, tex( map, vUv ).rgb, vc.a ) * light.rgb, 1.0 );
#elif defined( LAYERS_ADDED )

2
dDashboardServer/static/js/scenery-core.js
View File

@@ -111,7 +111,7 @@ export const TECHNIQUE = {
* The conversion format (Scenery.cpp FORMAT_VERSION) these views are written for. Manifest URLs carry it, so a
* browser never draws with a manifest it kept from an older server (they are cached for up to a day).
*/
export const SCENERY_FORMAT = 5;
export const SCENERY_FORMAT = 6;
/** A manifest URL asking for SCENERY_FORMAT's manifest (the server ignores the parameter; browsers cache by it). */
export function manifestUrl(url) {