r3347 - trunk/data/scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Feb 9 03:04:14 EST 2008
Author: div0
Date: 2008-02-09 03:04:14 -0500 (Sat, 09 Feb 2008)
New Revision: 3347
Modified:
trunk/data/scripts/dsi.shader
trunk/data/scripts/e7.shader
trunk/data/scripts/eX.shader
trunk/data/scripts/el3dm1.shader
trunk/data/scripts/evil3.shader
trunk/data/scripts/evil4_techtrims.shader
trunk/data/scripts/evil5.shader
trunk/data/scripts/evil6_support.shader
trunk/data/scripts/evil6_trims.shader
trunk/data/scripts/evil6_walls.shader
trunk/data/scripts/evil8_base.shader
trunk/data/scripts/morphed.shader
trunk/data/scripts/official_cmp1.shader
trunk/data/scripts/reaper.shader
trunk/data/scripts/stralenex1.shader
Log:
LOTS of shader bugfixes (stages for files that don't exist)
Modified: trunk/data/scripts/dsi.shader
===================================================================
--- trunk/data/scripts/dsi.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/dsi.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -1,43 +1,3 @@
-textures/liquids/dsiwater_ripple
-{
- qer_editorimage textures/liquids/pool3d_3c.tga
- qer_trans .5
- q3map_globaltexture
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm water
- cull disable
- deformVertexes wave 64 sin .5 .5 0 .5
- {
- map textures/liquids/pool3d_5c.tga
- blendFunc GL_dst_color GL_one
- rgbgen identity
- tcmod scale .5 .5
- tcmod transform 1.5 0 1.5 1 1 2
- tcmod scroll -.05 .001
- }
- {
- map textures/liquids/pool3d_6c.tga
- blendFunc GL_dst_color GL_one
- rgbgen identity
- tcmod scale .5 .5
- tcmod transform 0 1.5 1 1.5 2 1
- tcmod scroll .025 -.001
- }
- {
- map textures/liquids/pool3d_3c.tga
- blendFunc GL_dst_color GL_one
- rgbgen identity
- tcmod scale .25 .5
- tcmod scroll .001 .025
- }
- {
- map $lightmap
- blendFunc GL_dst_color GL_zero
- rgbgen identity
- }
-}
-
textures/dsi/weapspawn01
{
surfaceparm nomarks
@@ -50,11 +10,6 @@
rgbGen Vertex
tcMod rotate 45
}
- {
- map textures/dsi/weapspawn01.blend.tga
- blendfunc add
- rgbGen Vertex
- }
}
textures/dsi/dsiglass
Modified: trunk/data/scripts/e7.shader
===================================================================
--- trunk/data/scripts/e7.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/e7.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -27,7 +27,6 @@
textures/e7/e7mlight
{
qer_editorimage textures/e7/e7mlight.tga
- q3map_lightimage textures/e7/e7mlight.blend.tga
surfaceparm nomarks
q3map_surfacelight 1500
{
@@ -40,11 +39,6 @@
blendfunc filter
rgbGen identity
}
- {
- map textures/e7/e7mlight.blend.tga
- blendfunc add
- rgbGen identity
- }
}
//small light
@@ -52,7 +46,6 @@
textures/e7/e7slight
{
qer_editorimage textures/e7/e7slight.tga
- q3map_lightimage textures/e7/e7slight.blend.tga
surfaceparm nomarks
q3map_surfacelight 2500
{
@@ -65,17 +58,11 @@
blendfunc filter
rgbGen identity
}
- {
- map textures/e7/e7slight.blend.tga
- blendfunc add
- rgbGen identity
- }
}
textures/e7/e7trimlight
{
qer_editorimage textures/e7/e7trimlight.tga
- q3map_lightimage textures/e7/e7trimlight.blend.tga
surfaceparm nomarks
q3map_surfacelight 700
{
@@ -88,11 +75,6 @@
blendfunc filter
rgbGen identity
}
- {
- map textures/e7/e7trimlight.blend.tga
- blendfunc add
- rgbGen identity
- }
}
//evilgrate
@@ -265,4 +247,4 @@
tcGen lightmap
depthFunc equal
}
-}
\ No newline at end of file
+}
Modified: trunk/data/scripts/eX.shader
===================================================================
--- trunk/data/scripts/eX.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/eX.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -627,9 +627,9 @@
textures/eX/eXmetal_plate01b
{
- qer_EditorImage textures/eX/eXmetal_plate01b.tga
+ qer_EditorImage textures/eX/eXmetal_plate01B.tga
{
- map textures/eX/eXmetal_plate01b
+ map textures/eX/eXmetal_plate01B
}
{
map $lightmap
Modified: trunk/data/scripts/el3dm1.shader
===================================================================
--- trunk/data/scripts/el3dm1.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/el3dm1.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -1,40 +1,3 @@
-textures/e8/e8weirdfx1
-{
- {
- map textures/e8/e8weirdfx1.tga
- rgbGen wave sawtooth 0 1 2 3
- tcMod turb 0 0.5 0 1
- tcMod scroll 2 0
- }
- {
- map textures/e8/e8weirdfx1.tga
- blendfunc add
- rgbGen wave noise 0 1 0 0.4
- tcMod scroll 1 2
- }
-}
-
-textures/e8/e8blueglow
-{
- qer_editorimage textures/e8/e8blueglow.tga
- q3map_lightimage textures/e8/e8blueglow.blend.tga
- surfaceparm nomarks
- q3map_surfacelight 950
- {
- map textures/e8/e8blueglow.tga
- }
- {
- map $lightmap
- blendfunc filter
- tcGen lightmap
- }
- {
- map textures/e8/e8blueglow.blend.tga
- blendfunc add
- //rgbGen Vertex
- }
-}
-
textures/e8/e8alphaspawn
{
surfaceparm nomarks
@@ -72,11 +35,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/e8/e8tinylightblue.blend.tga
- blendfunc add
- rgbGen wave noise 0 1 0 0.4
- }
}
//id shader modified..
@@ -121,7 +79,6 @@
textures/e8/e8lighttrim_static
{
qer_editorimage textures/e8/e8lighttrim.tga
- //q3map_lightimage textures/e8/e8lighttrim.blend.tga
surfaceparm nomarks
q3map_surfacelight 400
{
@@ -132,16 +89,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/e8/e8lighttrim.blend.tga
- blendfunc add
- }
}
textures/e8/e8lighttrim_glow
{
qer_editorimage textures/e8/e8lighttrim.tga
- //q3map_lightimage textures/e8/e8lighttrim.blend.tga
surfaceparm nomarks
q3map_surfacelight 400
{
@@ -152,17 +104,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/e8/e8lighttrim.blend.tga
- rgbGen wave sawtooth .2 1 1 .2
- blendfunc add
- }
}
textures/e8/e8lighttrim_b_static
{
qer_editorimage textures/e8/e8lighttrim_b.tga
- //q3map_lightimage textures/e8/e8lighttrim_b.blend.tga
surfaceparm nomarks
q3map_surfacelight 400
{
@@ -173,17 +119,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/e8/e8lighttrim_b.blend.tga
- blendfunc add
- //rgbGen identity
}
-}
textures/e8/e8lighttrim_b_glow
{
qer_editorimage textures/e8/e8lighttrim_b.tga
- //q3map_lightimage textures/e8/e8lighttrim_b.blend.tga
surfaceparm nomarks
q3map_surfacelight 400
{
@@ -194,63 +134,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/e8/e8lighttrim_b.blend.tga
- rgbGen wave sawtooth .2 1 1 .2
- blendfunc add
- }
}
-textures/e8/e8jumpspawn02
-{
- surfaceparm metalsteps
- q3map_lightimage textures/e8/e8jumpspawn02_fx.tga
- q3map_surfacelight 100
- {
- map textures/e8/e8jumpspawn02_fx.tga
- rgbGen identity
- tcMod rotate 760
- }
- {
- map textures/e8/e8jumpspawn02.tga
- blendfunc blend
- rgbGen identity
- }
- {
- map $lightmap
- blendfunc gl_dst_color gl_one_minus_dst_alpha
- rgbGen identity
- tcGen lightmap
- }
-}
-
-textures/e8/e8jumpspawn02d
-{
- surfaceparm metalsteps
- q3map_lightimage textures/e8/e8jumpspawn02_fx.tga
- q3map_surfacelight 100
- {
- map textures/e8/e8jumpspawn02_fx.tga
- rgbGen identity
- tcMod rotate 760
- }
- {
- map textures/e8/e8jumpspawn02d.tga
- blendfunc blend
- rgbGen identity
- }
- {
- map $lightmap
- blendfunc gl_dst_color gl_one_minus_dst_alpha
- rgbGen identity
- tcGen lightmap
- }
-}
-
textures/e8/e8_launchpad1
{
surfaceparm metalsteps
- q3map_lightimage textures/e8/e8_launchpad1.blend.tga
q3map_surfacelight 100
{
map textures/e8/e8_launchpad1_fx.tga
@@ -263,11 +151,6 @@
rgbGen identity
}
{
- map textures/e8/e8_launchpad1.blend.tga
- blendfunc add
- rgbGen wave triangle 0.2 2 1 2
- }
- {
map $lightmap
blendfunc gl_dst_color gl_one_minus_dst_alpha
rgbGen identity
@@ -275,30 +158,6 @@
}
}
-textures/e8/e8red_dcl
-{
- surfaceparm nomarks
- surfaceparm trans
- surfaceparm pointlight
- {
- map textures/e8/e8red_dcl.tga
- blendfunc add
- rgbGen Vertex
- }
-}
-
-textures/e8/e8blue_dcl
-{
- surfaceparm nomarks
- surfaceparm trans
- surfaceparm pointlight
- {
- map textures/e8/e8blue_dcl.tga
- blendfunc add
- rgbGen Vertex
- }
-}
-
textures/e8/e8xgirder
{
surfaceparm alphashadow
@@ -358,69 +217,6 @@
}
}
-textures/e8/e8wrntrim2
-{
- surfaceparm alphashadow
- surfaceparm metalsteps
- surfaceparm trans
- cull disable
- {
- map textures/e8/e8wrntrim2.tga
- rgbGen identity
- depthWrite
- alphaFunc GE128
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- depthFunc equal
- }
-}
-
-textures/e8/e8bgrate01
-{
- surfaceparm alphashadow
- surfaceparm metalsteps
- //surfaceparm trans
- //cull disable
- cull none
- {
- map textures/e8/e8bgrate01.tga
- rgbGen identity
- depthWrite
- alphaFunc GE128
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- depthFunc equal
- }
-}
-
-textures/e8/e8rail
-{
- surfaceparm alphashadow
- cull disable
- nomipmaps
- {
- map textures/e8/e8rail.tga
- rgbGen identity
- depthWrite
- alphaFunc GE128
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- depthFunc equal
- }
-}
-
textures/e8/e8rail2
{
surfaceparm alphashadow
@@ -441,209 +237,6 @@
}
}
-textures/e8/e8icon_red
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- {
- map textures/e8/e8icon_red.tga
- blendfunc add
- rgbGen wave triangle 0.2 0.5 0 0.2
- }
-}
-
-textures/e8/e8icon_blue
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- {
- map textures/e8/e8icon_blue.tga
- blendfunc add
- rgbGen wave triangle 0.2 0.5 0 0.2
- }
-}
-
-textures/e8/e8scuffs1
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- qer_trans 0.4
- {
- map textures/e8/e8scuffs1.tga
- blendfunc blend
- rgbGen Vertex
- depthWrite
- }
-}
-
-textures/e8/e8circle_red
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- {
- map textures/e8/e8circle_red.tga
- blendfunc add
- rgbGen identity
- }
-}
-
-textures/e8/e8circle_blue
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- {
- map textures/e8/e8circle_blue.tga
- blendfunc add
- rgbGen identity
- }
-}
-
-textures/e8/e8circle_red_fade
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- {
- map textures/e8/e8circle_red_fade.tga
- blendfunc add
- rgbGen wave triangle 0.2 0.5 0 0.5
- }
-}
-
-textures/e8/e8circle_blue_fade
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- {
- map textures/e8/e8circle_blue_fade.tga
- blendfunc add
- rgbGen wave triangle 0.2 0.5 0 0.5
- }
-}
-
-textures/e8/e8flag_red
-{
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- deformVertexes wave 30 sin 0 3 0 0.2
- deformVertexes wave 100 sin 0 3 0 0.7
- tessSize 64
- {
- map textures/e8/e8flag_red.tga
- rgbGen Vertex
- depthWrite
- alphaFunc GE128
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- depthFunc equal
- }
-}
-
-textures/e8/e8flag_blue
-{
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm trans
- cull disable
- deformVertexes wave 30 sin 0 3 0 0.2
- deformVertexes wave 100 sin 0 3 0 0.7
- tessSize 64
- {
- map textures/e8/e8flag_blue.tga
- rgbGen Vertex
- depthWrite
- alphaFunc GE128
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- depthFunc equal
- }
-}
-
-textures/e8/e8spawn01b
-{
- {
- map textures/sfx/proto_zzztblu2.tga
- rgbGen identity
- tcMod turb 0 0.5 0 9.6
- tcMod scale 2 2
- tcMod scroll 9 5
- }
- {
- map textures/e8/e8spawn01b.tga
- blendfunc blend
- rgbGen identity
- }
- {
- map $lightmap
- blendfunc gl_dst_color gl_one_minus_dst_alpha
- rgbGen identity
- tcGen lightmap
- }
-}
-
-textures/e8/e8trim_bluefx
-{
- q3map_lightimage textures/e8/e8trimfx_b.tga
- q3map_surfacelight 100
- {
- map $lightmap
- rgbGen identity
- tcGen lightmap
- }
- {
- map textures/e8/e8trim_bluefx.tga
- blendfunc filter
- rgbGen identity
- }
- {
- map textures/e8/e8trimfx_b.tga
- blendfunc add
- tcMod scroll -2 0
- }
-}
-
-textures/e8/e8trim_redfx
-{
- q3map_lightimage textures/e8/e8trimfx_r.tga
- q3map_surfacelight 100
- {
- map $lightmap
- rgbGen identity
- tcGen lightmap
- }
- {
- map textures/e8/e8trim_redfx.tga
- blendfunc filter
- rgbGen identity
- }
- {
- map textures/e8/e8trimfx_r.tga
- blendfunc add
- tcMod scroll -2 0
- }
-}
-
textures/e8/e8evilspacetxt
{
surfaceparm nomarks
@@ -656,62 +249,6 @@
}
}
-textures/e8/e8tinylight
-{
- qer_editorimage textures/e8/e8tinylight.tga
- q3map_lightimage textures/e8/e8tinylight.blend.tga
- surfaceparm nomarks
- q3map_surfacelight 950
- {
- map textures/e8/e8tinylight.tga
- }
- {
- map $lightmap
- blendfunc filter
- tcGen lightmap
- }
- {
- map textures/e8/e8tinylight.blend.tga
- blendfunc add
- }
-}
-
-textures/e8/e8tinylightblue
-{
- qer_editorimage textures/e8/e8tinylightblue.tga
- //q3map_lightimage textures/e8/e8tinylightblue.blend.tga
- surfaceparm nomarks
- q3map_surfacelight 950
- {
- map textures/e8/e8tinylightblue.tga
- }
- {
- map $lightmap
- blendfunc filter
- tcGen lightmap
- }
- {
- map textures/e8/e8tinylightblue.blend.tga
- blendfunc add
- }
-}
-
-textures/e8/e8beam
-{
- qer_editorimage textures/e8/e8beam.tga
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm nonsolid
- surfaceparm trans
- cull disable
- qer_trans 0.6
- {
- map textures/e8/e8beam.tga
- blendfunc add
- tcMod scroll 0.3 0
- }
-}
-
textures/e8/e8beam_blue
{
qer_editorimage textures/e8/e8beam_blue.tga
@@ -737,11 +274,6 @@
tcGen environment
}
{
- map textures/e8/e8metal03c.tga
- blendfunc blend
- rgbGen identity
- }
- {
map $lightmap
blendfunc gl_dst_color gl_one_minus_dst_alpha
rgbGen identity
@@ -791,11 +323,6 @@
tcGen environment
}
{
- map textures/e8/e8metal_blue.tga
- blendfunc blend
- rgbGen identity
- }
- {
map $lightmap
blendfunc gl_dst_color gl_one_minus_dst_alpha
rgbGen identity
@@ -812,11 +339,6 @@
tcGen environment
}
{
- map textures/e8/e8metal_red.tga
- blendfunc blend
- rgbGen identity
- }
- {
map $lightmap
blendfunc gl_dst_color gl_one_minus_dst_alpha
rgbGen identity
@@ -850,7 +372,6 @@
textures/e8/e8trimlight2
{
qer_editorimage textures/e8/e8trimlight2.tga
- //q3map_lightimage textures/e8/e8trimlight2.blend.tga
surfaceparm nomarks
q3map_surfacelight 400
{
@@ -861,10 +382,4 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/e8/e8trimlight2.blend.tga
- //rgbGen wave sawtooth .2 1 1 .2
- blendfunc add
- tcMod scroll -0.7 0
- }
}
Modified: trunk/data/scripts/evil3.shader
===================================================================
--- trunk/data/scripts/evil3.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil3.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -6,73 +6,6 @@
//NOTE FROM Yves: Please edit this .shader all you want, there might have some problems...
//--------------------------------------------
-textures/evil_floors/mtl-wlkway
-{
- surfaceparm metalsteps
- surfaceparm trans
- cull none
- nopicmip
- {
- map textures/evil_floors/mtl-wlkway.tga
- blendFunc GL_ONE GL_ZERO
- alphaFunc GE128
- depthWrite
- rgbGen identity
- }
- {
- map $lightmap
- rgbGen identity
- blendFunc GL_DST_COLOR GL_ZERO
- depthFunc equal
- }
-}
-
-//-------------------------------------------------
-
-textures/evil_floors/mtl-wlkway_end
-{
- surfaceparm metalsteps
- surfaceparm trans
- cull none
- nopicmip
- {
- map textures/evil_floors/mtl-wlkway_end.tga
- blendFunc GL_ONE GL_ZERO
- alphaFunc GE128
- depthWrite
- rgbGen identity
- }
- {
- map $lightmap
- rgbGen identity
- blendFunc GL_DST_COLOR GL_ZERO
- depthFunc equal
- }
-}
-
-//---------------------------------------------
-
-textures/evil_floors/mtl-wlkway_mid
-{
- surfaceparm metalsteps
- surfaceparm trans
- cull none
- nopicmip
- {
- map textures/evil_floors/mtl-wlkway_mid.tga
- blendFunc GL_ONE GL_ZERO
- alphaFunc GE128
- depthWrite
- rgbGen identity
- }
- {
- map $lightmap
- rgbGen identity
- blendFunc GL_DST_COLOR GL_ZERO
- depthFunc equal
- }
-}
-
//------------------------------------------
textures/evil_floors/t-flr_oddtile_drty
@@ -99,52 +32,6 @@
//-------------------------------------------------
-textures/evil_floors/cemtiledrk_mhbrk
-{
- {
- map textures/evil_floors/cemtiledrk_mhbrk_glow.tga
- tcMod turb 1.2 1 1.2 1
- tcmod scale 0 0
- tcmod scroll .1 .1
- blendFunc GL_ONE GL_ZERO
- rgbGen identity
- }
- {
- map textures/evil_floors/cemtiledrk_mhbrk.tga
- blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
- rgbGen identity
- }
- {
- map $lightmap
- blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
- rgbGen identity
- }
-}
-
-//-----------------------------------
-
-textures/evil_floors/grt_offmtl
-{
- surfaceparm metalsteps
- surfaceparm alphashadow
- surfaceparm trans
- surfaceparm nonsolid
- cull none
- {
- map textures/evil_floors/grt_offmtl.tga
- alphaFunc GE128
- depthWrite
- rgbGen identity
- }
- {
- map $lightmap
- rgbGen identity
- blendFunc filter
- depthFunc equal
- }
-}
-//-------------------------------------------
-
textures/evil_floors/grtmtl_offt
{
surfaceparm metalsteps
@@ -166,29 +53,6 @@
}
}
-//------------------------------------------
-
-textures/evil_floors/grtmtl_offt2
-{
- surfaceparm metalsteps
- surfaceparm alphashadow
- surfaceparm trans
- surfaceparm nonsolid
- cull none
- {
- map textures/evil_floors/grtmtl_offt2.tga
- alphaFunc GE128
- depthWrite
- rgbGen identity
- }
- {
- map $lightmap
- rgbGen identity
- blendFunc filter
- depthFunc equal
- }
-}
-
//----------------------------------------------
textures/evil_lights/rlight_a
@@ -205,11 +69,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil_lights/rlight_a_blend.tga
- rgbGen wave sin 0.5 0.5 1 1
- blendFunc GL_ONE GL_ONE
- }
}
//--------------------------------------------
@@ -227,13 +86,8 @@
rgbGen identity
}
{
- map textures/evil_misc/rstbouncefan.tga
- blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
- rgbGen identity
- }
- {
map $lightmap
blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
rgbGen identity
}
-}
\ No newline at end of file
+}
Modified: trunk/data/scripts/evil4_techtrims.shader
===================================================================
--- trunk/data/scripts/evil4_techtrims.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil4_techtrims.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -284,34 +284,6 @@
//********************************************
//********************************************
//********************************************
-//**************evil wall section****************
-//********************************************
-//********************************************
-//********************************************
-
-textures/evil4_wall/tekwallmulti2
-{
- {
- map textures/base_wall/chrome_env.tga
- rgbGen identity
- tcGen environment
- tcmod scale .25 .25
- }
- {
- map textures/evil4_wall/tekwallmulti2.tga
- blendFunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
- rgbGen identity
- }
- {
- map $lightmap
- blendfunc gl_dst_color gl_zero
- rgbGen identity
- }
-}
-
-//********************************************
-//********************************************
-//********************************************
//**************evil lights section***************
//********************************************
//********************************************
@@ -393,11 +365,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil4_lights/t_mtllight_blend.jpg
- //rgbGen wave sin 0.5 0.5 1 1
- blendfunc GL_ONE GL_ONE
- }
}
textures/evil4_lights/mtl_lightsmll
@@ -414,11 +381,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil4_lights/mtl_lightsmll_blend.jpg
- rgbGen wave sin 0.5 0.5 1 1
- blendfunc GL_ONE GL_ONE
- }
}
//double glowing effect light strips
@@ -436,15 +398,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil4_lights/l_light_b_blend.jpg
- blendfunc GL_ONE GL_ONE
- }
- {
- map textures/evil4_lights/l_light_b_blend.jpg
- rgbGen wave sin 6 2 1 2
- blendfunc GL_ONE GL_ONE
- }
}
textures/evil4_lights/l_light_g
@@ -460,15 +413,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil4_lights/l_light_g_blend.jpg
- blendfunc GL_ONE GL_ONE
- }
- {
- map textures/evil4_lights/l_light_g_blend.jpg
- rgbGen wave sin 6 2 1 2
- blendfunc GL_ONE GL_ONE
- }
}
textures/evil4_lights/l_light_r
@@ -484,15 +428,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil4_lights/l_light_r_blend.jpg
- blendfunc GL_ONE GL_ONE
- }
- {
- map textures/evil4_lights/l_light_r_blend.jpg
- rgbGen wave sin 6 2 1 2
- blendfunc GL_ONE GL_ONE
- }
}
textures/evil4_lights/l_light_w
@@ -508,15 +443,6 @@
blendFunc GL_DST_COLOR GL_ZERO
rgbGen identity
}
- {
- map textures/evil4_lights/l_light_w_blend.jpg
- blendfunc GL_ONE GL_ONE
- }
- {
- map textures/evil4_lights/l_light_w_blend.jpg
- rgbGen wave sin 6 2 1 2
- blendfunc GL_ONE GL_ONE
- }
}
textures/evil4_lights/mtl_l1
@@ -573,7 +499,6 @@
textures/evil4_lights/trimtl_grlbtm_light
{
q3map_surfacelight 5000
- q3map_lightimage textures/evil4_lights/trimtl_grlbtm_light_blnd.tga
qer_editorimage textures/evil4_lights/trimtl_grlbtm_light.tga
{
map textures/evil4_lights/trimtl_grlbtm_light.tga
@@ -584,11 +509,6 @@
rgbGen identity
blendfunc gl_dst_color gl_zero
}
- {
- map textures/evil4_lights/trimtl_grlbtm_light_blnd.tga
- blendfunc gl_one gl_one
- rgbgen wave sin 1 .1 0 1
- }
}
textures/evil4_lights/s_bluelight
@@ -659,161 +579,8 @@
}
}
-//matrixy transparent display images
-
-textures/evil4_fx/mat1
-{
- {
- map textures/evil4_fx/mat1.tga
- blendfunc GL_ONE GL_ONE
- rgbGen identity
- rgbGen wave sin 0.5 0.5 0 0.7
- }
- {
- map textures/evil4_fx/mat2.tga
- blendfunc GL_ONE GL_ONE
- rgbGen identity
- rgbGen wave sin 0.5 0.5 0 .2
- }
- {
- map textures/evil4_fx/mat3.tga
- blendfunc GL_ONE GL_ONE
- rgbGen identity
- tcMod scroll 0 -.1
- }
- {
- map textures/evil4_fx/mat4.tga
- blendfunc GL_ONE GL_ONE
- rgbGen identity
- tcMod scroll 0 2
- }
- {
- map $lightmap
- rgbGen identity
- blendfunc GL_ONE_MINUS_SRC_ALPHA GL_SRC_ALPHA
- }
-}
-
-textures/evil4_fx/b_ray
-{
- q3map_surfacelight 200
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm nomarks
- surfaceparm nolightmap
- q3map_lightimage textures/evil4_fx/b_ray.tga
- cull none
- {
- map textures/evil4_fx/b_ray.tga
- blendFunc GL_ONE GL_ONE
- rgbgen wave triangle 1 9 1 1
- tcMod scale 0 0
- tcMod scroll 1 0
- }
- {
- map textures/evil4_fx/b_ray.tga
- blendFunc GL_ONE GL_ONE
- rgbgen wave triangle 1 1 1 1
- tcMod scale 1 1
- tcMod scroll 1 0
- }
-}
-
-//effect2
-
-textures/evil4_fx/b_rayc
-{
- q3map_surfacelight 200
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm nomarks
- surfaceparm nolightmap
- q3map_lightimage textures/evil4_fx/b_rayc.tga
- cull none
- {
- map textures/evil4_fx/b_rayc.tga
- blendFunc GL_ONE GL_ONE
- rgbgen wave triangle 1 9 1 1
- tcMod scale 0 0
- tcMod scroll 2 0
- }
- {
- map textures/evil4_fx/b_rayc.tga
- blendFunc GL_ONE GL_ONE
- rgbgen wave triangle 1 1 1 1
- tcMod scale 1 1
- tcMod scroll 2 0
- }
-}
-
//snow
-textures/evil4_fx/esnow
-{
- q3map_surfacelight 100
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm nomarks
- surfaceparm nolightmap
- q3map_lightimage textures/evil4fx/esnow.tga
- cull none
- {
- map textures/evil4_fx/esnow.tga
- blendFunc GL_ONE GL_ONE
- tcMod scroll 0 -0.9
- }
- {
- map textures/evil4_fx/esnow3.tga
- blendFunc GL_ONE GL_ONE
- tcMod scroll 0 -0.7
- }
- {
- map textures/evil4_fx/esnow2.tga
- blendFunc GL_ONE GL_ONE
- tcMod scroll 0 -0.5
- }
- {
- map textures/evil4_fx/esnow2.tga
- blendFunc GL_ONE GL_ONE
- tcMod scale 2 2
- tcMod scroll 0 -3
- }
-}
-
-//weirdo waterfallÕish effect
-
-textures/evil4_fx/e_waterfall
-{
- q3map_surfacelight 2
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm nomarks
- surfaceparm nolightmap
- q3map_lightimage textures/evil4_fx/e_waterfall.tga
- cull none
- {
- map textures/evil4_fx/e_waterfall.tga
- tcGen environment
- blendFunc GL_ONE GL_ONE
- rgbgen wave triangle 2 1 1 5
- tcMod scale 5 5
- tcMod scroll 0 -1
- }
- {
- map textures/evil4_fx/e_waterfall.tga
- tcGen environment
- tcmod scale 1 1
- tcmod scroll 1 -1
- blendFunc GL_ONE GL_ONE
- rgbGen identity
- }
- {
- map $lightmap
- blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
- rgbGen identity
- }
-}
-
textures/evil4_fx/teleprtr
{
cull disable
@@ -1049,20 +816,6 @@
}
}
-textures/evil4_techwalls/drkmtl_dpanelwrnb2
-{
- {
- map textures/evil_techwalls/drkmtl_dpanelwrnb2.tga
- blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
- rgbGen identity
- }
- {
- map $lightmap
- blendFunc GL_DST_COLOR GL_ONE_MINUS_DST_ALPHA
- rgbGen identity
- }
-}
-
//********************************************
//********************************************
//********************************************
Modified: trunk/data/scripts/evil5.shader
===================================================================
--- trunk/data/scripts/evil5.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil5.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -19,11 +19,6 @@
textures/evil5_floor/confllrtile2pad
{
{
- map textures/base_wall/chrome_env.tga
- tcGen environment
- tcmod scale .25 .25
- }
- {
map textures/evil5_floor/confllrtile2pad.tga
blendFunc blend
}
@@ -33,177 +28,6 @@
}
}
-textures/evil5_floor/contekfllr
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/contekfllr.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/contekfllr2
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/contekfllr2.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/contekfllr2b
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/contekfllr2b.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/contekfllr_b
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/contekfllr_b.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/contekfllr_c
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/contekfllr_c.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/contekfllr_single
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/contekfllr_single.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/flr_drmtlodhlz
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/flr_dkmtlodhlz.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/flr_mtlhls
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/flr_mtlhls.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_floor/flr_rstmtlhls
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- surfaceparm metalsteps
- cull none
- {
- map textures/evil5_floor/flr_rstmtlhls.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
textures/evil5_floor/tekconfllr_fx
{
surfaceparm trans
@@ -227,113 +51,3 @@
depthfunc equal
}
}
-
-//Misc
-
-textures/evil5_misc/pallette_top
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- cull none
- {
- map textures/evil5_misc/pallette_top.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-textures/evil5_misc/pallette_side
-{
- surfaceparm trans
- surfaceparm alphashadow
- surfaceparm nomarks
- cull none
- {
- map textures/evil5_misc/pallette_side.tga
- alphaFunc GE128
- depthWrite
- }
- {
- map $lightmap
- blendFunc filter
- depthFunc equal
- }
-}
-
-//Trims and steps (lights)
-
-textures/evil5_trim/trim_light_drkrst
-{
- q3map_surfacelight 100
- {
- map textures/evil5_trim/trim_light_drkrst.tga
- }
- {
- map $lightmap
- blendfunc filter
- }
- {
- map textures/evil5_trim/trim_light_drkrst_glow.tga
- blendFunc add
- rgbGen wave sin .5 .5 0 1
- }
-}
-
-textures/evil5_trim/stepside_mtl4light
-{
- q3map_surfacelight 100
- {
- map textures/evil5_trim/stepside_mtl4light.tga
- }
- {
- map $lightmap
- blendfunc filter
- }
- {
- map textures/evil5_trim/stepside_mtl4light_glw.tga
- blendFunc add
- rgbGen wave sin .5 .5 0 1
- }
-}
-
-textures/evil5_trim/stepside_mtllight
-{
- q3map_surfacelight 100
- {
- map textures/evil5_trim/stepside_mtllight.tga
- }
- {
- map $lightmap
- blendfunc filter
- }
- {
- map textures/evil5_trim/stepside_mtllight_blnd.tga
- blendFunc add
- rgbGen wave sin .5 .5 0 1
- }
-}
-
-//walls (lights)
-
-textures/evil5_wall/crete_tblight
-{
- q3map_surfacelight 100
- {
- map textures/evil5_wall/crete_tblight.tga
- }
- {
- map $lightmap
- blendfunc filter
- }
- {
- map textures/evil5_wall/crete_tblight_blend.tga
- blendFunc add
- rgbGen wave sin .5 .5 0 1
- }
-}
Modified: trunk/data/scripts/evil6_support.shader
===================================================================
--- trunk/data/scripts/evil6_support.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil6_support.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -70,10 +70,6 @@
map $lightmap
blendfunc filter
}
- {
- map textures/evil6_support/e6vlight_supp_blend.tga
- blendfunc add
- }
}
textures/evil6_support/e6x_supprt_s
@@ -112,4 +108,4 @@
depthfunc equal
blendfunc filter
}
-}
\ No newline at end of file
+}
Modified: trunk/data/scripts/evil6_trims.shader
===================================================================
--- trunk/data/scripts/evil6_trims.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil6_trims.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -9,20 +9,12 @@
map $lightmap
blendfunc filter
}
- {
- map textures/evil6_trims/e6btrim_light_blend.tga
- blendfunc add
- }
}
textures/evil6_trims/e6metalfan_s
{
qer_editorimage textures/evil6_trims/e6metalfan.tga
{
- map textures/evil6_trims/e6metalfan_blade.tga
- tcmod rotate 5000
- }
- {
map textures/evil6_trims/e6metalfan.tga
blendfunc blend
}
@@ -43,10 +35,6 @@
map $lightmap
blendfunc filter
}
- {
- map textures/evil6_trims/e6strimlight_blend.tga
- blendfunc add
- }
}
textures/evil6_trims/e6trim_bsrlight_s_nolight
@@ -60,10 +48,6 @@
map $lightmap
blendfunc filter
}
- {
- map textures/evil6_trims/e6trim_bsrlight_blend.tga
- blendfunc add
- }
}
textures/evil6_trims/e6trim_light_s_nolight
@@ -77,8 +61,4 @@
map $lightmap
blendfunc filter
}
- {
- map textures/evil6_trims/e6trim_light_blend.tga
- blendfunc add
- }
-}
\ No newline at end of file
+}
Modified: trunk/data/scripts/evil6_walls.shader
===================================================================
--- trunk/data/scripts/evil6_walls.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil6_walls.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -94,11 +94,6 @@
map textures/evil6_walls/e6tdoor.tga
}
{
- map textures/evil6_walls/e6tdoor_fx.tga
- tcmod scroll -1 0
- blendFunc add
- }
- {
map textures/evil6_walls/e6tdoor.tga
blendFunc blend
}
@@ -106,4 +101,4 @@
map $lightmap
blendFunc filter
}
-}
\ No newline at end of file
+}
Modified: trunk/data/scripts/evil8_base.shader
===================================================================
--- trunk/data/scripts/evil8_base.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/evil8_base.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -45,7 +45,6 @@
textures/evil8_lights/e8btrimlight
{
qer_editorimage textures/evil8_lights/e8btrimlight.tga
- q3map_lightimage textures/evil8_lights/e8btrimlight.blend.tga
surfaceparm nomarks
q3map_surfacelight 250
{
@@ -56,16 +55,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8btrimlight.blend.tga
- blendfunc add
- }
}
textures/evil8_floor/e8warn2steplight
{
qer_editorimage textures/evil8_floor/e8warn2steplight.tga
- q3map_lightimage textures/evil8_floor/e8warn2steplight.blend.tga
surfaceparm nomarks
q3map_surfacelight 250
{
@@ -76,16 +70,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_floor/e8warn2steplight.blend.tga
- blendfunc add
- }
}
textures/evil8_floor/e8minitrimlight
{
qer_editorimage textures/evil8_lights/e8minitrimlight.tga
- q3map_lightimage textures/evil8_lights/e8minitrimlight.blend.tga
surfaceparm nomarks
q3map_surfacelight 250
{
@@ -96,10 +85,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8minitrimlight.blend.tga
- blendfunc add
- }
}
textures/evil8_fx/e8_jumppad02
@@ -122,7 +107,6 @@
textures/evil8_lights/e8_rlightb2
{
qer_editorimage textures/evil8_lights/e8_rlightb2.tga
- q3map_lightimage textures/evil8_lights/e8_rlightb2.blend.tga
surfaceparm nomarks
q3map_surfacelight 450
{
@@ -133,16 +117,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8_rlightb2.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8_rlightb
{
qer_editorimage textures/evil8_lights/e8_rlightb.tga
- q3map_lightimage textures/evil8_lights/e8_rlightb.blend.tga
surfaceparm nomarks
q3map_surfacelight 450
{
@@ -153,16 +132,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8_rlightb.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/evil8_rlight
{
qer_editorimage textures/evil8_lights/e8_rlight.tga
- q3map_lightimage textures/evil8_lights/e8_rlight.blend.tga
surfaceparm nomarks
q3map_surfacelight 950
{
@@ -173,16 +147,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8_rlight.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8tmtllight
{
qer_editorimage textures/evil8_lights/e8tmtllight.tga
- q3map_lightimage textures/evil8_lights/e8tmtllight.blend.tga
surfaceparm nomarks
q3map_surfacelight 950
{
@@ -193,16 +162,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tmtllight.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8tmtllight2
{
qer_editorimage textures/evil8_lights/e8tmtllight2.tga
- q3map_lightimage textures/evil8_lights/e8tmtllight2.blend.tga
surfaceparm nomarks
q3map_surfacelight 950
{
@@ -213,16 +177,11 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tmtllight2.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8tmtllight2b
{
qer_editorimage textures/evil8_lights/e8tmtllight2b.tga
- q3map_lightimage textures/evil8_lights/e8tmtllight2b.blend.tga
surfaceparm nomarks
q3map_surfacelight 950
{
@@ -233,10 +192,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tmtllight2b.blend.tga
- blendfunc add
- }
}
textures/evil8_grate/e8xgirder_small2
@@ -294,10 +249,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_trim/e8lighttrim.blend.tga
- blendfunc add
- }
}
textures/evil8_trim/e8lighttrim_glow
@@ -313,11 +264,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_trim/e8lighttrim.blend.tga
- blendfunc add
- rgbGen wave sawtooth 0.2 1 1 0.2
- }
}
textures/evil8_trim/e8lighttrim_b_static
@@ -333,10 +279,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_trim/e8lighttrim_b.blend.tga
- blendfunc add
- }
}
textures/evil8_trim/e8lighttrim_b_glow
@@ -352,11 +294,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_trim/e8lighttrim_b.blend.tga
- blendfunc add
- rgbGen wave sawtooth 0.2 1 1 0.2
- }
}
textures/evil8_fx/e8jumpspawn02grey
@@ -379,7 +316,7 @@
textures/evil8_fx/e8jumpspawn02
{
- q3map_lightimage textures/evil8_fx/e8jumpspawn02_fx.tga
+ q3map_lightimage textures/evil8_fx/e8jumpspawn02.tga
surfaceparm metalsteps
q3map_surfacelight 100
@@ -414,15 +351,9 @@
textures/evil8_fx/e8jumpspawn02b
{
- q3map_lightimage textures/evil8_fx/e8jumpspawn02_fx.tga
surfaceparm metalsteps
q3map_surfacelight 100
{
- map textures/evil8_fx/e8jumpspawn02_fx.tga
- rgbGen identity
- tcMod rotate 760
- }
- {
map textures/evil8_fx/e8jumpspawn02b.tga
blendfunc blend
rgbGen identity
@@ -437,15 +368,9 @@
textures/evil8_fx/e8jumpspawn02c
{
- q3map_lightimage textures/evil8_fx/e8jumpspawn02_fx.tga
surfaceparm metalsteps
q3map_surfacelight 100
{
- map textures/evil8_fx/e8jumpspawn02_fx.tga
- rgbGen identity
- tcMod rotate 760
- }
- {
map textures/evil8_fx/e8jumpspawn02c.tga
blendfunc blend
rgbGen identity
@@ -460,7 +385,6 @@
textures/evil8_fx/e8_launchpad1
{
- q3map_lightimage textures/evil8_fx/e8_launchpad1.blend.tga
surfaceparm metalsteps
q3map_surfacelight 100
{
@@ -723,13 +647,6 @@
textures/evil8_fx/e8spawn01b
{
{
- map textures/sfx/proto_zzztblu2.tga
- rgbGen identity
- tcMod turb 0 0.5 0 9.6
- tcMod scale 2 2
- tcMod scroll 9 5
- }
- {
map textures/evil8_fx/e8spawn01b.tga
blendfunc blend
rgbGen identity
@@ -801,7 +718,6 @@
textures/evil8_lights/e8tinylight
{
qer_editorimage textures/evil8_lights/e8tinylight.tga
- q3map_lightimage textures/evil8_lights/e8tinylight.blend.tga
surfaceparm nomarks
q3map_surfacelight 950
{
@@ -812,10 +728,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tinylight.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8tinylightblue
@@ -831,10 +743,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tinylightblue.blend.tga
- blendfunc add
- }
}
textures/evil8_fx/e8beam
@@ -968,11 +876,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_trim/e8trimlight2_blue.blend.tga
- blendfunc add
- tcMod scroll -0.7 0
- }
}
textures/evil8_trim/e8trimlight2_red
@@ -988,11 +891,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_trim/e8trimlight2_red.blend.tga
- blendfunc add
- tcMod scroll -0.7 0
- }
}
//===========================//
Modified: trunk/data/scripts/morphed.shader
===================================================================
--- trunk/data/scripts/morphed.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/morphed.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -1,40 +1,3 @@
-textures/morphed/slimem
-{
- qer_editorimage textures/morphed/slimem.tga
- qer_trans 0.5
- surfaceparm noimpact
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm slime
- q3map_surfacelight 250
- Q3map_TessSize 128
- cull none
- {
- map textures/morphed/slimem.tga
- blendFunc add
- rgbGen identity
- }
-}
-
-textures/morphed/slimem_warp
-{
- qer_editorimage textures/morphed/slimem.tga
- qer_trans 0.5
- surfaceparm noimpact
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm slime
- q3map_surfacelight 250
- deformVertexes wave 150.0 sin 2 5 0.25 0.1
- Q3map_TessSize 128
- cull none
- {
- map textures/morphed/slimem.tga
- blendFunc add
- rgbGen identity
- }
-}
-
textures/morphed/gelslime
{
qer_editorimage textures/morphed/gelslime.tga
Modified: trunk/data/scripts/official_cmp1.shader
===================================================================
--- trunk/data/scripts/official_cmp1.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/official_cmp1.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -36,11 +36,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/cmp1-dm8/e8trimlight2_pur.blend.tga
- blendfunc add
- rgbGen wave sin 0.7 0.2 0 0.3
- }
}
textures/cmp1-dm8/e8tinylightpur
@@ -56,11 +51,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/cmp1-dm8/e8tinylightpur.blend.tga
- blendfunc add
- rgbGen wave noise 0.5 0.3 0 0.2
- }
}
textures/cmp1-dm8/e8lighttrim_b_pur
@@ -76,11 +66,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/cmp1-dm8/e8lighttrim_pur.blend.tga
- blendfunc add
- rgbGen wave sin 0.4 0.2 0 0.2
- }
}
textures/cmp1-dm8/e8lighttrim_pur
@@ -96,11 +81,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/cmp1-dm8/e8lighttrim_p.blend.tga
- blendfunc add
- rgbGen wave sin 0.4 0.2 0 0.2
- }
}
textures/cmp1-dm8/e8circle_pur
Modified: trunk/data/scripts/reaper.shader
===================================================================
--- trunk/data/scripts/reaper.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/reaper.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -12,270 +12,6 @@
}
}
-textures/Reaptxt/Notext
-{
- qer_editorimage textures/Reaptxt/Notext.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/Notext.jpg
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaptxt/solsjrA
-{
- qer_editorimage textures/Reaptxt/solsjrA.tga
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/solsjrA.tga
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaptxt/p1sjr
-{
- qer_editorimage textures/Reaptxt/p1sjr.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/p1sjr.jpg
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaptxt/frizsjr
-{
- qer_editorimage textures/Reaptxt/frizsjr.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/frizsjr.jpg
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaptxt/p1chbr
-{
- qer_editorimage textures/Reaptxt/p1chbr.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/p1chbr.jpg
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling, BumpMapping Lightmap Emulation & High Lightmap resolution
-
-textures/Reaptxt/tuilestoit
-{
- qer_editorimage textures/Reaptxt/tuilestoit.tga
- q3map_lightmapSampleSize 1
- q3map_normalimage textures/Reaptxt/tuilestoit_norm.tga
- {
- map textures/Reaptxt/tuilestoit.tga
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaptxt/murext
-{
- qer_editorimage textures/Reaptxt/murext.tga
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/murext.tga
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling, BumpMapping Lightmap Emulation & High Lightmap resolution
-
-textures/Reaptxt/brownstone
-{
- qer_editorimage textures/Reaptxt/brownstone.jpg
- q3map_lightmapSampleSize 1
- q3map_normalImage textures/Reaptxt/brownstone_norm.jpg
- {
- map textures/Reaptxt/brownstone.jpg
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaptxt/Notext2
-{
- qer_editorimage textures/Reaptxt/Notext2.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaptxt/Notext2.jpg
- rgbGen identity
- }
- {
- map textures/Reaptxt/detail.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaper_dirt/grass7
-{
- qer_editorimage textures/Reaper_dirt/grass7.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaper_dirt/grass7.jpg
- rgbGen identity
- }
- {
- map textures/Reaper_dirt/grass7.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
-//Multisampling & High Lightmap resolution
-
-textures/Reaper_dirt/grass8
-{
- qer_editorimage textures/Reaper_dirt/grass8.jpg
- q3map_lightmapSampleSize 1
- {
- map textures/Reaper_dirt/grass8.jpg
- rgbGen identity
- }
- {
- map textures/Reaper_dirt/grass8.jpg
- blendfunc gl_dst_color gl_src_color
- rgbGen identity
- tcMod scale 2 2
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- }
-}
-
//Corona Shader, texture by HipShot
textures/Reaptxt/HSglow01
@@ -351,21 +87,6 @@
}
}
-//Alpha Channel, Texture by Lud
-
-textures/research_detail/lud_atomic.tga
-{
- qer_editorimage textures/research_detail/lud_atomic.tga
- qer_trans 0.5
- cull none
- surfaceparm playerclip
- {
- map textures/research_detail/lud_atomic.tga
- blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
- rgbGen vertex
- }
-}
-
//Volumetric Shadow
textures/shad/shad
Modified: trunk/data/scripts/stralenex1.shader
===================================================================
--- trunk/data/scripts/stralenex1.shader 2008-02-09 08:03:32 UTC (rev 3346)
+++ trunk/data/scripts/stralenex1.shader 2008-02-09 08:04:14 UTC (rev 3347)
@@ -1,7 +1,6 @@
textures/evil8_lights/e8minitrimlight
{
qer_editorimage textures/evil8_lights/e8minitrimlight.tga
- q3map_lightimage textures/evil8_lights/e8minitrimlight.blend.tga
surfaceparm nomarks
q3map_surfacelight 1200
{
@@ -12,10 +11,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8minitrimlight.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8tinylight2k
{
@@ -31,10 +26,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tinylight.blend.tga
- blendfunc add
- }
}
textures/evil8_lights/e8tinylightblue2k
@@ -51,10 +42,6 @@
blendfunc filter
tcGen lightmap
}
- {
- map textures/evil8_lights/e8tinylightblue.blend.tga
- blendfunc add
- }
}
textures/stralenex1/light_tube_green
@@ -77,30 +64,6 @@
}
-textures/stralenex1/e8_bluestrip
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- {
- map textures/stralenex1/e8_bluestrip.tga
- blendfunc add
- rgbGen identity
- }
-}
-
-textures/stralenex1/e8_redstrip
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- {
- map textures/stralenex1/e8_redstrip.tga
- blendfunc add
- rgbGen identity
- }
-}
-
textures/stralenex1/stralenex5_water
{
qer_editorimage textures/stralenex1/stralenex5_water.tga
@@ -366,4 +329,4 @@
tcGen lightmap
}
-}
\ No newline at end of file
+}
More information about the nexuiz-commits
mailing list