From fb20b80b8fab6a3aaee378bde3a59d373747587f Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 21 Apr 2021 17:18:17 +0200 Subject: [PATCH] Update testmap materials to have fallback info for pre-GLSL renderers --- .../textures/measure/ceiling.mat | 15 ++++++++--- .../textures/measure/counter.mat | 15 ++++++++--- .../textures/measure/desk.mat | 15 ++++++++--- .../textures/measure/door.mat | 15 ++++++++--- .../textures/measure/floor.mat | 15 ++++++++--- .../textures/measure/ladder.mat | 20 +++++++++++++- .../textures/measure/mat_alien.mat | 16 ++++++++--- .../textures/measure/mat_computer.mat | 16 ++++++++--- .../textures/measure/mat_concrete.mat | 16 ++++++++--- .../textures/measure/mat_dirt.mat | 16 ++++++++--- .../textures/measure/mat_flesh.mat | 16 ++++++++--- .../textures/measure/mat_foliage.mat | 16 ++++++++--- .../textures/measure/mat_glass.mat | 16 ++++++++--- .../textures/measure/mat_grate.mat | 16 ++++++++--- .../textures/measure/mat_metal.mat | 16 ++++++++--- .../textures/measure/mat_sand.mat | 16 ++++++++--- .../textures/measure/mat_slosh.mat | 16 ++++++++--- .../textures/measure/mat_snow.mat | 16 ++++++++--- .../textures/measure/mat_tile.mat | 16 ++++++++--- .../textures/measure/mat_vent.mat | 16 ++++++++--- .../textures/measure/mat_wood.mat | 16 ++++++++--- .../textures/measure/stairs1.mat | 15 ++++++++--- .../textures/measure/wall128.mat | 15 ++++++++--- .../textures/measure/wall128_blend.mat | 20 +++++++++++++- .../textures/measure/wall128b.mat | 15 ++++++++--- .../textures/measure/wall128g.mat | 15 ++++++++--- .../textures/measure/wall128gr.mat | 15 ++++++++--- .../textures/measure/wall128pl.mat | 15 ++++++++--- .../textures/measure/wall32.mat | 15 ++++++++--- .../textures/measure/wall64.mat | 15 ++++++++--- .../textures/measure/wall64a.mat | 15 ++++++++--- .../textures/next/asphalt1.mat | 15 +++++++++-- .../textures/next/asphalt2.mat | 17 +++++++++--- .../textures/next/asphalt3.mat | 15 +++++++++-- .../textures/next/bunker1.mat | 15 ++++++++++- .../textures/next/bunker2.mat | 15 ++++++++++- .../textures/next/bunker3.mat | 15 ++++++++++- .../textures/next/bunker4.mat | 15 ++++++++++- .../textures/next/bunker5.mat | 15 ++++++++++- .../textures/next/bunker6.mat | 15 ++++++++++- .../textures/next/bunker7.mat | 15 ++++++++++- .../textures/next/bunker8.mat | 15 ++++++++++- .../textures/next/bunker9.mat | 15 ++++++++++- .../textures/next/cracked1.mat | 15 ++++++++++- .../textures/next/cracked2.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/dirty1.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/dirty2.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/dirty3.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/dirty4.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth1.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth2.mat | 20 +++++++++++--- .../test_maps.pk3dir/textures/next/earth3.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth4.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth5.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth6.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth7.mat | 15 ++++++++++- .../textures/next/earth7_terrain.mat | 14 ++++++++++ .../test_maps.pk3dir/textures/next/earth8.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/earth9.mat | 15 ++++++++++- .../textures/next/plywood1.mat | 15 ++++++++++- .../textures/next/plywood2.mat | 15 ++++++++++- .../textures/next/plywood3.mat | 15 ++++++++++- .../textures/next/plywood4.mat | 15 ++++++++++- .../textures/next/plywood5.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/rusty1.mat | 15 ++++++++++- .../textures/next/rusty1_to_rusty5.mat | 18 +++++++++++++ .../test_maps.pk3dir/textures/next/rusty2.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/rusty3.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/rusty4.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/rusty5.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/rusty6.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/rusty7.mat | 15 ++++++++++- .../textures/next/tarmac1.mat | 15 +++++++++-- .../textures/next/tarmac2.mat | 15 +++++++++-- .../test_maps.pk3dir/textures/next/vent1.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/vent2.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/vent3.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/vent4.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/next/vent5.mat | 15 ++++++++++- .../test_maps.pk3dir/textures/skies/dune.mat | 27 ++++++++++++++----- .../textures/skies/recotta.mat | 23 ++++++++++------ .../textures/skies/smudge.mat | 13 ++++----- .../textures/skies/sundown.mat | 27 ++++++++++++++----- .../textures/skies/yukongold.mat | 22 ++++++++++----- .../test_maps.pk3dir/textures/test_me.mat | 15 +++++++++-- 85 files changed, 1153 insertions(+), 193 deletions(-) diff --git a/platform/test_maps.pk3dir/textures/measure/ceiling.mat b/platform/test_maps.pk3dir/textures/measure/ceiling.mat index 15f9814f..c97e8bd2 100644 --- a/platform/test_maps.pk3dir/textures/measure/ceiling.mat +++ b/platform/test_maps.pk3dir/textures/measure/ceiling.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/ceiling.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/ceiling.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/counter.mat b/platform/test_maps.pk3dir/textures/measure/counter.mat index e84c91b4..e40df4b1 100644 --- a/platform/test_maps.pk3dir/textures/measure/counter.mat +++ b/platform/test_maps.pk3dir/textures/measure/counter.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/counter.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/counter.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/desk.mat b/platform/test_maps.pk3dir/textures/measure/desk.mat index 7f4729dc..7922a375 100644 --- a/platform/test_maps.pk3dir/textures/measure/desk.mat +++ b/platform/test_maps.pk3dir/textures/measure/desk.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/desk.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/desk.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/door.mat b/platform/test_maps.pk3dir/textures/measure/door.mat index 4c04e0cf..88ff141b 100644 --- a/platform/test_maps.pk3dir/textures/measure/door.mat +++ b/platform/test_maps.pk3dir/textures/measure/door.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/door.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/door.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/floor.mat b/platform/test_maps.pk3dir/textures/measure/floor.mat index ade5ab7c..c43c4acb 100644 --- a/platform/test_maps.pk3dir/textures/measure/floor.mat +++ b/platform/test_maps.pk3dir/textures/measure/floor.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/floor.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/floor.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/ladder.mat b/platform/test_maps.pk3dir/textures/measure/ladder.mat index 6e7503ce..fe6dc329 100644 --- a/platform/test_maps.pk3dir/textures/measure/ladder.mat +++ b/platform/test_maps.pk3dir/textures/measure/ladder.mat @@ -1,5 +1,23 @@ // Vera Visions Material { + surfaceparm alphashadow + surfaceparm trans + +if $programs program lightmapped_alphatest - diffusemap textures/measure/ladder.tga + diffusemap "textures/measure/ladder.tga" +else + { + map "textures/measure/ladder.tga" + alphaFunc GE128 + depthWrite + rgbGen identity + } + { + map $lightmap + rgbGen identity + blendFunc filter + depthFunc equal + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_alien.mat b/platform/test_maps.pk3dir/textures/measure/mat_alien.mat index f9248aff..378ad11d 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_alien.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_alien.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm alien - diffusemap textures/measure/mat_alien.tga + surfaceParm alien +if $programs + program lightmapped + diffusemap textures/measure/mat_alien.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_alien.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_computer.mat b/platform/test_maps.pk3dir/textures/measure/mat_computer.mat index a5c9185d..1a638344 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_computer.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_computer.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm computer - diffusemap textures/measure/mat_computer.tga + surfaceParm computer +if $programs + program lightmapped + diffusemap textures/measure/mat_computer.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_computer.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_concrete.mat b/platform/test_maps.pk3dir/textures/measure/mat_concrete.mat index d76dd20d..551a4ca0 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_concrete.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_concrete.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm concrete - diffusemap textures/measure/mat_concrete.tga + surfaceParm concrete +if $programs + program lightmapped + diffusemap textures/measure/mat_concrete.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_concrete.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_dirt.mat b/platform/test_maps.pk3dir/textures/measure/mat_dirt.mat index b5a8ac6f..1eb433b8 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_dirt.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_dirt.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm dirt - diffusemap textures/measure/mat_dirt.tga + surfaceParm dirt +if $programs + program lightmapped + diffusemap textures/measure/mat_dirt.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_dirt.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_flesh.mat b/platform/test_maps.pk3dir/textures/measure/mat_flesh.mat index 0e278e65..43b7b066 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_flesh.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_flesh.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm flesh - diffusemap textures/measure/mat_flesh.tga + surfaceParm flesh +if $programs + program lightmapped + diffusemap textures/measure/mat_flesh.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_flesh.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_foliage.mat b/platform/test_maps.pk3dir/textures/measure/mat_foliage.mat index 23db5b3d..28fea005 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_foliage.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_foliage.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm foliage - diffusemap textures/measure/mat_foliage.tga + surfaceParm foliage +if $programs + program lightmapped + diffusemap textures/measure/mat_foliage.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_foliage.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_glass.mat b/platform/test_maps.pk3dir/textures/measure/mat_glass.mat index 64860b0c..c90c6361 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_glass.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_glass.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm glass - diffusemap textures/measure/mat_glass.tga + surfaceParm glass +if $programs + program lightmapped + diffusemap textures/measure/mat_glass.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_glass.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_grate.mat b/platform/test_maps.pk3dir/textures/measure/mat_grate.mat index 46e69e1f..19e3532e 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_grate.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_grate.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm grate - diffusemap textures/measure/mat_grate.tga + surfaceParm grate +if $programs + program lightmapped + diffusemap textures/measure/mat_grate.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_grate.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_metal.mat b/platform/test_maps.pk3dir/textures/measure/mat_metal.mat index 210215fb..9b0cb778 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_metal.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_metal.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm metal - diffusemap textures/measure/mat_metal.tga + surfaceParm metal +if $programs + program lightmapped + diffusemap textures/measure/mat_metal.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_metal.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_sand.mat b/platform/test_maps.pk3dir/textures/measure/mat_sand.mat index 0660b4ec..3a8dc323 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_sand.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_sand.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm sand - diffusemap textures/measure/mat_sand.tga + surfaceParm sand +if $programs + program lightmapped + diffusemap textures/measure/mat_sand.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_sand.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_slosh.mat b/platform/test_maps.pk3dir/textures/measure/mat_slosh.mat index 4907c149..a53b2fbe 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_slosh.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_slosh.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm slosh - diffusemap textures/measure/mat_slosh.tga + surfaceParm slosh +if $programs + program lightmapped + diffusemap textures/measure/mat_slosh.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_slosh.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_snow.mat b/platform/test_maps.pk3dir/textures/measure/mat_snow.mat index a24a5076..4ab70128 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_snow.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_snow.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm snow - diffusemap textures/measure/mat_snow.tga + surfaceParm snow +if $programs + program lightmapped + diffusemap textures/measure/mat_snow.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_snow.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_tile.mat b/platform/test_maps.pk3dir/textures/measure/mat_tile.mat index 08bd139c..088b2854 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_tile.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_tile.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm tile - diffusemap textures/measure/mat_tile.tga + surfaceParm tile +if $programs + program lightmapped + diffusemap textures/measure/mat_tile.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_tile.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_vent.mat b/platform/test_maps.pk3dir/textures/measure/mat_vent.mat index 0a97ce85..c569e712 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_vent.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_vent.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm vent - diffusemap textures/measure/mat_vent.tga + surfaceParm vent +if $programs + program lightmapped + diffusemap textures/measure/mat_vent.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_vent.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/mat_wood.mat b/platform/test_maps.pk3dir/textures/measure/mat_wood.mat index d73e5c84..44131310 100644 --- a/platform/test_maps.pk3dir/textures/measure/mat_wood.mat +++ b/platform/test_maps.pk3dir/textures/measure/mat_wood.mat @@ -1,9 +1,19 @@ // Vera Visions Material { - surfaceparm wood - diffusemap textures/measure/mat_wood.tga + surfaceParm wood +if $programs + program lightmapped + diffusemap textures/measure/mat_wood.tga +else { - program lightmapped + map $lightmap + rgbGen identity } + { + map textures/measure/mat_wood.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/stairs1.mat b/platform/test_maps.pk3dir/textures/measure/stairs1.mat index 32584952..3965e72f 100644 --- a/platform/test_maps.pk3dir/textures/measure/stairs1.mat +++ b/platform/test_maps.pk3dir/textures/measure/stairs1.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/stairs1.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/stairs1.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall128.mat b/platform/test_maps.pk3dir/textures/measure/wall128.mat index c904235f..15e5f402 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall128.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall128.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall128.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall128.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall128_blend.mat b/platform/test_maps.pk3dir/textures/measure/wall128_blend.mat index e83d8774..071a82a8 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall128_blend.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall128_blend.mat @@ -1,9 +1,10 @@ // Vera Visions Material { vmap_lightmapMergable - qer_editorImage "textures/measure/wall128b.tga" + qer_editorImage "textures/measure/wall128.tga" polygonOffset 1 +if $programs { program terrain map "textures/measure/wall128.tga" @@ -11,4 +12,21 @@ map $whiteimage map $whiteimage } +else + { + map "textures/measure/wall128.tga" + rgbGen identity + } + { + map "textures/measure/wall128b.tga" + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + } + { + map $lightmap + rgbGen identity + blendFunc filter + depthFunc equal + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall128b.mat b/platform/test_maps.pk3dir/textures/measure/wall128b.mat index 2c11abdd..42c5da10 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall128b.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall128b.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall128b.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall128b.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall128g.mat b/platform/test_maps.pk3dir/textures/measure/wall128g.mat index 6f85c26a..c9176d4f 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall128g.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall128g.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall128g.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall128g.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall128gr.mat b/platform/test_maps.pk3dir/textures/measure/wall128gr.mat index 785cbe7a..c0fb2d98 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall128gr.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall128gr.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall128gr.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall128gr.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall128pl.mat b/platform/test_maps.pk3dir/textures/measure/wall128pl.mat index beda4268..832ad502 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall128pl.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall128pl.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall128pl.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall128pl.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall32.mat b/platform/test_maps.pk3dir/textures/measure/wall32.mat index 1fc89aa3..417b355c 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall32.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall32.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall32.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall32.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall64.mat b/platform/test_maps.pk3dir/textures/measure/wall64.mat index c7caa664..c500f47a 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall64.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall64.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall64.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall64.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/measure/wall64a.mat b/platform/test_maps.pk3dir/textures/measure/wall64a.mat index 155cd83c..08073f33 100644 --- a/platform/test_maps.pk3dir/textures/measure/wall64a.mat +++ b/platform/test_maps.pk3dir/textures/measure/wall64a.mat @@ -1,10 +1,17 @@ // Vera Visions Material { +if $programs + program lightmapped diffusemap textures/measure/wall64a.tga - +else { - program lightmapped - map $diffuse - map $normalmap + map $lightmap + rgbGen identity } + { + map textures/measure/wall64a.tga + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/asphalt1.mat b/platform/test_maps.pk3dir/textures/next/asphalt1.mat index b43db7d5..142fc8ba 100644 --- a/platform/test_maps.pk3dir/textures/next/asphalt1.mat +++ b/platform/test_maps.pk3dir/textures/next/asphalt1.mat @@ -1,10 +1,21 @@ // Vera Visions Material { - diffusemap textures/next/asphalt1.tga - +if $programs + diffusemap "textures/next/asphalt1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/asphalt1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/asphalt2.mat b/platform/test_maps.pk3dir/textures/next/asphalt2.mat index 00cb63c0..6a472f95 100644 --- a/platform/test_maps.pk3dir/textures/next/asphalt2.mat +++ b/platform/test_maps.pk3dir/textures/next/asphalt2.mat @@ -1,11 +1,22 @@ // Vera Visions Material { - diffusemap textures/next/asphalt2.tga - normalmap textures/next/asphalt2_normal.tga - +if $programs + diffusemap "textures/next/asphalt2.tga" + normalmap "textures/next/asphalt2_normal.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/asphalt2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/asphalt3.mat b/platform/test_maps.pk3dir/textures/next/asphalt3.mat index 2601d944..7e436bf4 100644 --- a/platform/test_maps.pk3dir/textures/next/asphalt3.mat +++ b/platform/test_maps.pk3dir/textures/next/asphalt3.mat @@ -1,10 +1,21 @@ // Vera Visions Material { - diffusemap textures/next/asphalt3.tga - +if $programs + diffusemap "textures/next/asphalt3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/asphalt3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker1.mat b/platform/test_maps.pk3dir/textures/next/bunker1.mat index f382b000..0561c677 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker1.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker1.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker2.mat b/platform/test_maps.pk3dir/textures/next/bunker2.mat index a24e42c2..3578297d 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker2.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker2.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker2.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker3.mat b/platform/test_maps.pk3dir/textures/next/bunker3.mat index 7f2f5673..ed40cdb0 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker3.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker3.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker3.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker4.mat b/platform/test_maps.pk3dir/textures/next/bunker4.mat index 25610597..91fc4ab5 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker4.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker4.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker4.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker4.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker4.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker5.mat b/platform/test_maps.pk3dir/textures/next/bunker5.mat index 6f929f8a..95191837 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker5.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker5.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker5.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker5.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker5.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker6.mat b/platform/test_maps.pk3dir/textures/next/bunker6.mat index dd8e5139..6c6965a1 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker6.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker6.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker6.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker6.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker6.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker7.mat b/platform/test_maps.pk3dir/textures/next/bunker7.mat index a2f680b3..e648df5e 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker7.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker7.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker7.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker7.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker7.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker8.mat b/platform/test_maps.pk3dir/textures/next/bunker8.mat index 2a15388d..360ea937 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker8.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker8.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker8.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker8.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker8.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/bunker9.mat b/platform/test_maps.pk3dir/textures/next/bunker9.mat index 31f8d423..66772ca7 100644 --- a/platform/test_maps.pk3dir/textures/next/bunker9.mat +++ b/platform/test_maps.pk3dir/textures/next/bunker9.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/bunker9.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/bunker9.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/bunker9.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/cracked1.mat b/platform/test_maps.pk3dir/textures/next/cracked1.mat index 6221d8e1..ca3ad8f7 100644 --- a/platform/test_maps.pk3dir/textures/next/cracked1.mat +++ b/platform/test_maps.pk3dir/textures/next/cracked1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/cracked1.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/cracked1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/cracked1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/cracked2.mat b/platform/test_maps.pk3dir/textures/next/cracked2.mat index 7317167d..d504d3a4 100644 --- a/platform/test_maps.pk3dir/textures/next/cracked2.mat +++ b/platform/test_maps.pk3dir/textures/next/cracked2.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/cracked2.tga + surfaceParm concrete +if $programs + diffusemap "textures/next/cracked2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/cracked2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/dirty1.mat b/platform/test_maps.pk3dir/textures/next/dirty1.mat index 0f99a39a..9d3fb025 100644 --- a/platform/test_maps.pk3dir/textures/next/dirty1.mat +++ b/platform/test_maps.pk3dir/textures/next/dirty1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/dirty1.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/dirty1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/dirty1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/dirty2.mat b/platform/test_maps.pk3dir/textures/next/dirty2.mat index 4090a60e..627909fa 100644 --- a/platform/test_maps.pk3dir/textures/next/dirty2.mat +++ b/platform/test_maps.pk3dir/textures/next/dirty2.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/dirty2.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/dirty2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/dirty2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/dirty3.mat b/platform/test_maps.pk3dir/textures/next/dirty3.mat index 0f92e54e..49c937e7 100644 --- a/platform/test_maps.pk3dir/textures/next/dirty3.mat +++ b/platform/test_maps.pk3dir/textures/next/dirty3.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/dirty3.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/dirty3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/dirty3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/dirty4.mat b/platform/test_maps.pk3dir/textures/next/dirty4.mat index 6855ec8c..bfa77986 100644 --- a/platform/test_maps.pk3dir/textures/next/dirty4.mat +++ b/platform/test_maps.pk3dir/textures/next/dirty4.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/dirty4.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/dirty4.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/dirty4.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth1.mat b/platform/test_maps.pk3dir/textures/next/earth1.mat index 78055054..51341a71 100644 --- a/platform/test_maps.pk3dir/textures/next/earth1.mat +++ b/platform/test_maps.pk3dir/textures/next/earth1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth1.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth2.mat b/platform/test_maps.pk3dir/textures/next/earth2.mat index aff85921..e1df82db 100644 --- a/platform/test_maps.pk3dir/textures/next/earth2.mat +++ b/platform/test_maps.pk3dir/textures/next/earth2.mat @@ -1,12 +1,24 @@ // Vera Visions Material { - diffusemap textures/next/earth2.tga - normalmap textures/next/earth2_normal.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth2.tga" + normalmap "textures/next/earth2_normal.tga" { - program lightmapped_reflectcube + program lightmapped map $diffuse map $normalmap - map $reflectcube } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth3.mat b/platform/test_maps.pk3dir/textures/next/earth3.mat index 506cda23..3660d5a5 100644 --- a/platform/test_maps.pk3dir/textures/next/earth3.mat +++ b/platform/test_maps.pk3dir/textures/next/earth3.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth3.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth4.mat b/platform/test_maps.pk3dir/textures/next/earth4.mat index ce09a6d7..9aa0d559 100644 --- a/platform/test_maps.pk3dir/textures/next/earth4.mat +++ b/platform/test_maps.pk3dir/textures/next/earth4.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth4.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth4.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth4.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth5.mat b/platform/test_maps.pk3dir/textures/next/earth5.mat index a915541a..79989aec 100644 --- a/platform/test_maps.pk3dir/textures/next/earth5.mat +++ b/platform/test_maps.pk3dir/textures/next/earth5.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth5.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth5.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth5.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth6.mat b/platform/test_maps.pk3dir/textures/next/earth6.mat index ed5d5f22..04524199 100644 --- a/platform/test_maps.pk3dir/textures/next/earth6.mat +++ b/platform/test_maps.pk3dir/textures/next/earth6.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth6.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth6.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth6.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth7.mat b/platform/test_maps.pk3dir/textures/next/earth7.mat index e7bbca57..0d00c395 100644 --- a/platform/test_maps.pk3dir/textures/next/earth7.mat +++ b/platform/test_maps.pk3dir/textures/next/earth7.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth7.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth7.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth7.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth7_terrain.mat b/platform/test_maps.pk3dir/textures/next/earth7_terrain.mat index 12193b92..34d808a0 100644 --- a/platform/test_maps.pk3dir/textures/next/earth7_terrain.mat +++ b/platform/test_maps.pk3dir/textures/next/earth7_terrain.mat @@ -3,8 +3,22 @@ polygonOffset 1 diffusemap textures/next/earth7.tga +if $programs { program terrain_alpha blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA } +else + { + map "textures/next/earth7.tga" + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + } + { + map $lightmap + rgbGen identity + blendFunc filter + depthFunc equal + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth8.mat b/platform/test_maps.pk3dir/textures/next/earth8.mat index 5ac044a8..48416e97 100644 --- a/platform/test_maps.pk3dir/textures/next/earth8.mat +++ b/platform/test_maps.pk3dir/textures/next/earth8.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth8.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth8.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth8.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/earth9.mat b/platform/test_maps.pk3dir/textures/next/earth9.mat index 3d8cb64c..ed44b62f 100644 --- a/platform/test_maps.pk3dir/textures/next/earth9.mat +++ b/platform/test_maps.pk3dir/textures/next/earth9.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/earth9.tga + surfaceParm dirt +if $programs + diffusemap "textures/next/earth9.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/earth9.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/plywood1.mat b/platform/test_maps.pk3dir/textures/next/plywood1.mat index b52dd70d..78452fe3 100644 --- a/platform/test_maps.pk3dir/textures/next/plywood1.mat +++ b/platform/test_maps.pk3dir/textures/next/plywood1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/plywood1.tga + surfaceParm wood +if $programs + diffusemap "textures/next/plywood1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/plywood1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/plywood2.mat b/platform/test_maps.pk3dir/textures/next/plywood2.mat index b9bee8b7..fbe97463 100644 --- a/platform/test_maps.pk3dir/textures/next/plywood2.mat +++ b/platform/test_maps.pk3dir/textures/next/plywood2.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/plywood2.tga + surfaceParm wood +if $programs + diffusemap "textures/next/plywood2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/plywood2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/plywood3.mat b/platform/test_maps.pk3dir/textures/next/plywood3.mat index ec66e044..c47a1fad 100644 --- a/platform/test_maps.pk3dir/textures/next/plywood3.mat +++ b/platform/test_maps.pk3dir/textures/next/plywood3.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/plywood3.tga + surfaceParm wood +if $programs + diffusemap "textures/next/plywood3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/plywood3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/plywood4.mat b/platform/test_maps.pk3dir/textures/next/plywood4.mat index 17d99fbd..4ba31eef 100644 --- a/platform/test_maps.pk3dir/textures/next/plywood4.mat +++ b/platform/test_maps.pk3dir/textures/next/plywood4.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/plywood4.tga + surfaceParm wood +if $programs + diffusemap "textures/next/plywood4.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/plywood4.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/plywood5.mat b/platform/test_maps.pk3dir/textures/next/plywood5.mat index 9f1c7975..58c5b7ad 100644 --- a/platform/test_maps.pk3dir/textures/next/plywood5.mat +++ b/platform/test_maps.pk3dir/textures/next/plywood5.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/plywood5.tga + surfaceParm wood +if $programs + diffusemap "textures/next/plywood5.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/plywood5.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty1.mat b/platform/test_maps.pk3dir/textures/next/rusty1.mat index fe2c521d..000d1a2e 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty1.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty1.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty1_to_rusty5.mat b/platform/test_maps.pk3dir/textures/next/rusty1_to_rusty5.mat index 2d94dc73..72391ba1 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty1_to_rusty5.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty1_to_rusty5.mat @@ -3,6 +3,7 @@ qer_editorImage "textures/next/rusty1.tga" polygonOffset 1 +if $programs { program terrain map "textures/next/rusty5.tga" @@ -10,4 +11,21 @@ map $normalmap map $normalmap } +else + { + map "textures/next/rusty5.tga" + rgbGen identity + } + { + map "textures/next/rusty7.tga" + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + } + { + map $lightmap + rgbGen identity + blendFunc filter + depthFunc equal + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty2.mat b/platform/test_maps.pk3dir/textures/next/rusty2.mat index 25485371..caf04586 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty2.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty2.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty2.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty3.mat b/platform/test_maps.pk3dir/textures/next/rusty3.mat index 95e3dea2..e04a3f01 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty3.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty3.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty3.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty4.mat b/platform/test_maps.pk3dir/textures/next/rusty4.mat index 5aeb7147..b5cb601e 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty4.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty4.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty4.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty4.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty4.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty5.mat b/platform/test_maps.pk3dir/textures/next/rusty5.mat index cbc0b7b0..626b54e4 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty5.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty5.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty5.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty5.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty5.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty6.mat b/platform/test_maps.pk3dir/textures/next/rusty6.mat index 26e982ab..7492d551 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty6.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty6.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty6.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty6.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty6.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/rusty7.mat b/platform/test_maps.pk3dir/textures/next/rusty7.mat index cb26aac0..3e8343e6 100644 --- a/platform/test_maps.pk3dir/textures/next/rusty7.mat +++ b/platform/test_maps.pk3dir/textures/next/rusty7.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/rusty7.tga + surfaceParm metal +if $programs + diffusemap "textures/next/rusty7.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/rusty7.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/tarmac1.mat b/platform/test_maps.pk3dir/textures/next/tarmac1.mat index a4cc6725..e167b333 100644 --- a/platform/test_maps.pk3dir/textures/next/tarmac1.mat +++ b/platform/test_maps.pk3dir/textures/next/tarmac1.mat @@ -1,10 +1,21 @@ // Vera Visions Material { - diffusemap textures/next/tarmac1.tga - +if $programs + diffusemap "textures/next/tarmac1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/tarmac1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/tarmac2.mat b/platform/test_maps.pk3dir/textures/next/tarmac2.mat index 9253dcf6..77a6c32a 100644 --- a/platform/test_maps.pk3dir/textures/next/tarmac2.mat +++ b/platform/test_maps.pk3dir/textures/next/tarmac2.mat @@ -1,10 +1,21 @@ // Vera Visions Material { - diffusemap textures/next/tarmac2.tga - +if $programs + diffusemap "textures/next/tarmac2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/tarmac2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/vent1.mat b/platform/test_maps.pk3dir/textures/next/vent1.mat index 6ee2c8c1..e64e3335 100644 --- a/platform/test_maps.pk3dir/textures/next/vent1.mat +++ b/platform/test_maps.pk3dir/textures/next/vent1.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/vent1.tga + surfaceParm vent +if $programs + diffusemap "textures/next/vent1.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/vent1.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/vent2.mat b/platform/test_maps.pk3dir/textures/next/vent2.mat index e246c1aa..fab08eb3 100644 --- a/platform/test_maps.pk3dir/textures/next/vent2.mat +++ b/platform/test_maps.pk3dir/textures/next/vent2.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/vent2.tga + surfaceParm vent +if $programs + diffusemap "textures/next/vent2.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/vent2.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/vent3.mat b/platform/test_maps.pk3dir/textures/next/vent3.mat index 3e7f3ad0..d1eec363 100644 --- a/platform/test_maps.pk3dir/textures/next/vent3.mat +++ b/platform/test_maps.pk3dir/textures/next/vent3.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/vent3.tga + surfaceParm vent +if $programs + diffusemap "textures/next/vent3.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/vent3.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/vent4.mat b/platform/test_maps.pk3dir/textures/next/vent4.mat index 10bb5577..76d96628 100644 --- a/platform/test_maps.pk3dir/textures/next/vent4.mat +++ b/platform/test_maps.pk3dir/textures/next/vent4.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/vent4.tga + surfaceParm vent +if $programs + diffusemap "textures/next/vent4.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/vent4.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/next/vent5.mat b/platform/test_maps.pk3dir/textures/next/vent5.mat index f12d6f7c..8b4437a0 100644 --- a/platform/test_maps.pk3dir/textures/next/vent5.mat +++ b/platform/test_maps.pk3dir/textures/next/vent5.mat @@ -1,10 +1,23 @@ // Vera Visions Material { - diffusemap textures/next/vent5.tga + surfaceParm vent +if $programs + diffusemap "textures/next/vent5.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/next/vent5.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif } diff --git a/platform/test_maps.pk3dir/textures/skies/dune.mat b/platform/test_maps.pk3dir/textures/skies/dune.mat index 15afadf5..663dc78e 100644 --- a/platform/test_maps.pk3dir/textures/skies/dune.mat +++ b/platform/test_maps.pk3dir/textures/skies/dune.mat @@ -1,17 +1,15 @@ // Vera Visions Material { - qer_editorImage textures/skies/dune.tga - skyParms - 256 - - vmap_globalTexture - + qer_editorImage "textures/skies/dune.tga" surfaceParm sky surfaceParm noimpact surfaceParm nolightmap surfaceParm nodlight - - nopicmip + noPicMip nomipmaps +if $programs + skyParms - 256 - { program skybox_hdr map $cube:textures/skies/dune_hdr/40th/bg @@ -20,4 +18,21 @@ map textures/skies/clouds/dunecloud.tga map textures/skies/clouds/dunecloud_layer.tga } +else + skyParms textures/skies/dune_hdr/250th/bg 256 - + { + map "textures/skies/clouds/dunecloud.tga" + tcMod scroll 0.001 0.001 + tcMod scale 5 5 + blendFunc blend + rgbGen identity + } + { + map "textures/skies/clouds/dunecloud_layer.tga" + tcMod scroll 0.002 0.002 + tcMod scale 5 5 + blendFunc blend + rgbGen identity + } +endif } diff --git a/platform/test_maps.pk3dir/textures/skies/recotta.mat b/platform/test_maps.pk3dir/textures/skies/recotta.mat index 20049b43..fef23be0 100644 --- a/platform/test_maps.pk3dir/textures/skies/recotta.mat +++ b/platform/test_maps.pk3dir/textures/skies/recotta.mat @@ -1,22 +1,29 @@ // Vera Visions Material { - qer_editorImage textures/skies/recotta.tga - skyParms textures/skies/recotta/bg 256 - - vmap_globalTexture - + qer_editorImage "textures/skies/recotta.tga" + surfaceParm sky surfaceParm noimpact surfaceParm nolightmap - surfaceParm sky surfaceParm nodlight - - vmap_skylight 200 4 - nopicmip + noPicMip nomipmaps +if $programs + skyParms - 256 - { program skybox map $cube:textures/skies/recotta/bg map textures/skies/clouds/dunecloud.tga map $blackimage } +else + skyParms textures/skies/recotta/bg 256 - + { + map "textures/skies/clouds/dunecloud.tga" + tcMod scroll 0.001 0.001 + tcMod scale 5 5 + blendFunc blend + rgbGen identity + } +endif } diff --git a/platform/test_maps.pk3dir/textures/skies/smudge.mat b/platform/test_maps.pk3dir/textures/skies/smudge.mat index f52a9817..5fb3325e 100644 --- a/platform/test_maps.pk3dir/textures/skies/smudge.mat +++ b/platform/test_maps.pk3dir/textures/skies/smudge.mat @@ -1,21 +1,22 @@ // Vera Visions Material { - qer_editorImage textures/skies/smudge.tga - skyParms - 256 - - vmap_globalTexture - + qer_editorImage "textures/skies/smudge.tga" surfaceParm sky surfaceParm noimpact surfaceParm nolightmap surfaceParm nodlight - - nopicmip + noPicMip nomipmaps +if $programs + skyParms - 256 - { program skybox map $cube:textures/skies/smudge/bg map $blackimage map $blackimage } +else + skyParms textures/skies/smudge/bg 256 - +endif } diff --git a/platform/test_maps.pk3dir/textures/skies/sundown.mat b/platform/test_maps.pk3dir/textures/skies/sundown.mat index 903cf3fd..671c2808 100644 --- a/platform/test_maps.pk3dir/textures/skies/sundown.mat +++ b/platform/test_maps.pk3dir/textures/skies/sundown.mat @@ -1,17 +1,15 @@ // Vera Visions Material { - qer_editorImage textures/skies/sundown/250th/bg_ft.tga - skyParms - 256 - - vmap_globalTexture - + qer_editorImage "textures/skies/sundown.tga" surfaceParm sky surfaceParm noimpact surfaceParm nolightmap surfaceParm nodlight - - nopicmip + noPicMip nomipmaps +if $programs + skyParms - 256 - { program skybox_hdr map $cube:textures/skies/sundown/40th/bg @@ -20,4 +18,21 @@ map textures/skies/clouds/dunecloud.tga map textures/skies/clouds/dunecloud_layer.tga } +else + skyParms textures/skies/sundown/250th/bg 256 - + { + map "textures/skies/clouds/dunecloud.tga" + tcMod scroll 0.001 0.001 + tcMod scale 5 5 + blendFunc blend + rgbGen identity + } + { + map "textures/skies/clouds/dunecloud_layer.tga" + tcMod scroll 0.002 0.002 + tcMod scale 5 5 + blendFunc blend + rgbGen identity + } +endif } diff --git a/platform/test_maps.pk3dir/textures/skies/yukongold.mat b/platform/test_maps.pk3dir/textures/skies/yukongold.mat index eb3d764c..17c09343 100644 --- a/platform/test_maps.pk3dir/textures/skies/yukongold.mat +++ b/platform/test_maps.pk3dir/textures/skies/yukongold.mat @@ -1,17 +1,15 @@ // Vera Visions Material { - qer_editorImage textures/skies/yukongold.tga - skyParms - 256 - - vmap_globalTexture - + qer_editorImage "textures/skies/yukongold.tga" surfaceParm sky surfaceParm noimpact surfaceParm nolightmap surfaceParm nodlight - - nopicmip + noPicMip nomipmaps - + +if $programs + skyParms - 256 - { program skybox_parallax map textures/skies/clouds/dustycloud.tga @@ -19,4 +17,14 @@ map $cube:textures/skies/yukongold/bg map $cube:textures/skies/yukongold/fg } +else + skyParms textures/skies/yukongold/bg 256 textures/skies/yukongold/fg + { + map "textures/skies/clouds/dustycloud.tga" + tcMod scroll 0.001 0.001 + tcMod scale 5 5 + blendFunc blend + rgbGen identity + } +endif } diff --git a/platform/test_maps.pk3dir/textures/test_me.mat b/platform/test_maps.pk3dir/textures/test_me.mat index 0d59122f..0de33a2d 100644 --- a/platform/test_maps.pk3dir/textures/test_me.mat +++ b/platform/test_maps.pk3dir/textures/test_me.mat @@ -1,10 +1,21 @@ // Vera Visions Material { - diffusemap textures/test_me.tga - +if $programs + diffusemap "textures/test_me.tga" { program lightmapped map $diffuse map $normalmap } +else + { + map $lightmap + rgbGen identity + } + { + map "textures/test_me.tga" + rgbGen identity + blendFunc GL_DST_COLOR GL_ZERO + } +endif }