diff --git a/gldefs.sheenhmg b/gldefs.sheenhmg new file mode 100644 index 000000000..476a779b8 --- /dev/null +++ b/gldefs.sheenhmg @@ -0,0 +1,5 @@ +HardwareShader Texture "models/SheenLED.png" +{ + Shader "shaders/glsl/Subpixel.fp" + Texture "pixtex" "textures/subpixel.png" +} diff --git a/language.version b/language.version index db65d44d3..06801245f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r192 \cu(Thu 21 Jul 13:25:02 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r192 \cu(2022-07-21 13:25:02)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r193 \cu(Thu 21 Jul 13:25:16 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r193 \cu(2022-07-21 13:25:16)\c-"; diff --git a/modeldef.sheenhmg b/modeldef.sheenhmg index 29dea52a1..6b1f1955b 100644 --- a/modeldef.sheenhmg +++ b/modeldef.sheenhmg @@ -4,7 +4,7 @@ Model "HeavyMahSheenGun" Model 0 "SheenHMGPickup_d.3d" SurfaceSkin 0 0 "SheenHMG.png" - SurfaceSkin 0 1 "-noflat-" + SurfaceSkin 0 1 "SheenLED.png" Scale 0.16 0.16 0.16 AngleOffset 90 ZOffset 20 diff --git a/models/SheenHMG.blend b/models/SheenHMG.blend index 4204f92df..3c4b9d01a 100644 Binary files a/models/SheenHMG.blend and b/models/SheenHMG.blend differ diff --git a/models/SheenHMGPickup_d.3d b/models/SheenHMGPickup_d.3d index 64ecab513..e4fa8b8d5 100644 Binary files a/models/SheenHMGPickup_d.3d and b/models/SheenHMGPickup_d.3d differ diff --git a/models/SheenLED.png b/models/SheenLED.png new file mode 100644 index 000000000..908169709 Binary files /dev/null and b/models/SheenLED.png differ diff --git a/models/SheenLED.xcf b/models/SheenLED.xcf new file mode 100644 index 000000000..bbf70682c Binary files /dev/null and b/models/SheenLED.xcf differ diff --git a/shaders/glsl/Subpixel.fp b/shaders/glsl/Subpixel.fp new file mode 100644 index 000000000..f40a454e9 --- /dev/null +++ b/shaders/glsl/Subpixel.fp @@ -0,0 +1,10 @@ +// RGB subpixel filter for Ammo LEDs + +void SetupMaterial( inout Material mat ) +{ + mat.Base = getTexel(vTexCoord.st); + vec2 uv = vTexCoord.st*vec2(textureSize(tex,0)); + mat.Base *= 1.5*texture(pixtex,uv); + mat.Normal = ApplyNormalMap(vTexCoord.st); + mat.Bright = vec4(1.); +} diff --git a/textures/subpixel.png b/textures/subpixel.png new file mode 100644 index 000000000..a283a66ce Binary files /dev/null and b/textures/subpixel.png differ