fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

More stuff broken.

Browse source 
Added control over texture coords on particles. Switched them to batch based on common render state. Less state changes there now.
Inverted sorting, to aid depth culling.
fullbrights use vbos too now.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3261 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-07-11 20:56:09 +00:00
parent d0e156d4b5
commit b5ac90d523
9 changed files with 535 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

139
engine/client/r_partset.c
View file

@ -6,9 +6,27 @@ char *particle_set_spikeset =
// and some others I probably forgot to mention
/////////////////////////////////////////////////
//rocket trails (derived from purplehaze's, with only minor tweeks)
"r_part rocketsmoke\n"
"{\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"step 8\n"
"scale 7.5\n"
"alpha 0.8\n"
"die 2\n"
"randomvel 3\n"
"rgb 10 10 10\n"
"blend modulate\n"
"spawnmode spiral\n"
"scalefactor 1\n"
"spawnvel 5\n"
"}\n"
"r_part rockettrail\n"
"{\n"
"texture \"particles/smoke.tga\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"step 4\n"
"scale 30\n"
"alpha 0.3\n"
@ -20,11 +38,13 @@ char *particle_set_spikeset =
"gravity -25\n"
"scalefactor 1\n"
"assoc rocketsmoke\n"
"spawnvel 10\n"
"}\n"
"r_part t_rocket\n"
"{\n"
"texture \"particles/rfire\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"step 2\n"
"scale 10\n"
"alpha 0.6\n"
@ -37,24 +57,10 @@ char *particle_set_spikeset =
"scaledelta -10\n"
"}\n"
"r_part rocketsmoke\n"
"{\n"
"texture \"particles/rtrail\"\n"
"step 8\n"
"scale 7.5\n"
"alpha 0.8\n"
"die 2\n"
"randomvel 3\n"
"rgb 10 10 10\n"
"blend modulate\n"
"spawnmode spiral\n"
"scalefactor 1\n"
"spawnvel 10\n"
"}\n"
"r_part rockettail\n"
"{\n"
"texture \"particles/rtrail\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"step 7\n"
"scale 10\n"
"alpha 0.3\n"
@ -68,7 +74,8 @@ char *particle_set_spikeset =
"r_part t_altrocket\n"
"{\n"
"texture \"particles/rtrail\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"step 4\n"
"scale 10\n"
"alpha 0.3\n"
@ -163,7 +170,8 @@ char *particle_set_spikeset =
"r_part shortfume\n"
"{\n"
"texture \"particles/smoke\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"scale 15\n"
"scaledelta 20\n"
"alpha 0.5\n"
@ -176,7 +184,8 @@ char *particle_set_spikeset =
"r_part t_grenade\n"
"{\n"
"texture \"particles/smoke\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"step 24\n"
"scale 16\n"
"scaledelta 4\n"
@ -194,7 +203,8 @@ char *particle_set_spikeset =
//cool's blood trails (cos they're cooler)
"r_part t_gib\n"
"{\n"
"texture \"particles/blood\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 1 63 63 256 2 64\n"
"step 32\n"
"scale 64\n"
"alpha 0.6\n"
@ -212,7 +222,8 @@ char *particle_set_spikeset =
"r_part t_zomgib\n"
"{\n"
"texture \"particles/blood\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 1 63 63 256 2 64\n"
"step 64\n"
"scale 64\n"
"alpha 0.6\n"
@ -230,7 +241,8 @@ char *particle_set_spikeset =
"r_part t_tracer\n"
"{\n"
"texture \"particles/tracer\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"scale 15\n"
"step 5\n"
"alpha 0.6\n"
@ -244,7 +256,8 @@ char *particle_set_spikeset =
"r_part t_tracer2\n"
"{\n"
"texture \"particles/tracer\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"scale 15\n"
"step 5\n"
"alpha 0.6\n"
@ -258,7 +271,8 @@ char *particle_set_spikeset =
"r_part t_tracer3\n"
"{\n"
"texture \"particles/tracer\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"scale 10\n"
"scaledelta -10\n"
"step 5\n"
@ -276,7 +290,8 @@ char *particle_set_spikeset =
//qw blood
"r_part te_lightningblood\n"
"{\n"
"texture \"particles/bloodtrail\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 97 255 159 256\n"
"count 3\n"
"scale 20\n"
"alpha 0.4\n"
@ -294,7 +309,8 @@ char *particle_set_spikeset =
//qw blood
"r_part te_blood\n"
"{\n"
"texture \"particles/blood\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 97 255 159 256\n"
"count 10\n"
"scale 10\n"
"alpha 0.3\n"
@ -311,7 +327,8 @@ char *particle_set_spikeset =
//nq blood
"r_part pe_73\n"
"{\n"
"texture \"particles/blood\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 97 255 159 256\n"
"count 1\n"
"scale 20\n"
"alpha 0.3\n"
@ -330,7 +347,8 @@ char *particle_set_spikeset =
"r_part ember\n"
"{\n"
"count 1\n"
"texture \"particles/explosion\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"rgb 255 128 76\n"
"alpha 0\n"
"scale 15\n"
@ -354,7 +372,8 @@ char *particle_set_spikeset =
"r_part expgib\n"
"{\n"
"cliptype expgib\n"
"texture \"particles/explosion\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"alpha 0\n"
"count 16\n"
"die 1\n"
@ -369,7 +388,8 @@ char *particle_set_spikeset =
//the heart of the explosion
"r_part te_explosion\n"
"{\n"
"texture \"particles/explosion\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"count 1\n"
"scale 200\n"
"scalefactor 1\n"
@ -383,7 +403,8 @@ char *particle_set_spikeset =
"r_part gunshotsmoke\n"
"{\n"
"texture \"particles/smoke\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 65 31 95 256 8 32\n"
"count 3\n"
"scale 25\n"
"scalefactor 1\n"
@ -400,7 +421,8 @@ char *particle_set_spikeset =
"r_part te_gunshot\n"
"{\n"
"type texturedspark\n"
"texture \"ball\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 65 31 95 256 8 32\n"
"count 3\n"
"scale 2\n"
"scalefactor 1\n"
@ -419,7 +441,8 @@ char *particle_set_spikeset =
"r_part spikecore\n"
"{\n"
"texture \"ball\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"count 1\n"
"scale 1\n"
"scalefactor 1\n"
@ -449,7 +472,8 @@ char *particle_set_spikeset =
"r_part te_lavasplash\n"
"{\n"
"texture \"default\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 129 1 191 63 256\n"
"count 654\n"
"scale 15\n"
"alpha 0.7\n"
@ -468,7 +492,8 @@ char *particle_set_spikeset =
//two rings moving upwards, costs less
"r_part teleportsplashdown\n"
"{\n"
"texture \"textures/smoke\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 1 255 63 256\n"
"count 32\n"
"scale 32\n"
"scalefactor 1\n"
@ -482,7 +507,8 @@ char *particle_set_spikeset =
"}\n"
"r_part te_teleportsplash\n"
"{\n"
"texture \"textures/smoke\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 1 255 63 256\n"
"count 32\n"
"scale 32\n"
"scalefactor 1\n"
@ -499,7 +525,8 @@ char *particle_set_spikeset =
//flame effect
"r_part cu_flame\n"
"{\n"
"texture \"particles/flame\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 129 1 191 63 256\n"
"count 1024\n"
"scale 0.4\n"
"scalerand 6\n"
@ -518,7 +545,8 @@ char *particle_set_spikeset =
//flame effect
"r_part cu_torch\n"
"{\n"
"texture \"particles/flame\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 129 1 191 63 256\n"
"count 256\n"
"scale 3\n"
"scalefactor 1\n"
@ -535,7 +563,8 @@ char *particle_set_spikeset =
"r_part explodesprite\n"
"{\n"
"texture \"particles/flame\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 97 97 191 191 256\n"
"count 180\n"
"scale 70\n"
"scaledelta -140\n"
@ -554,7 +583,8 @@ char *particle_set_spikeset =
//you'll probably never see this one
"r_part ef_entityparticles\n"
"{\n"
"texture \"j\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"count 1\n"
"scale 15\n"
"alpha 0.2\n"
@ -567,7 +597,8 @@ char *particle_set_spikeset =
// emp effect, based off of purplehaze's idea
"r_part empshocktrail\n"
"{\n"
"texture \"particles/spark\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 1 255 63 256\n"
"step 3.2\n"
"scale 3\n"
"alpha 0.7\n"
@ -580,7 +611,8 @@ char *particle_set_spikeset =
"r_part empcore\n"
"{\n"
"texture \"particles/flame\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 1 255 63 256\n"
"count 90\n"
"scale 55\n"
"scaledelta -110\n"
@ -599,7 +631,8 @@ char *particle_set_spikeset =
"r_part empflash\n"
"{\n"
"die 0.1\n"
"texture \"particles/flash\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 193 1 255 63 256\n"
"alpha 1\n"
"count 1\n"
"scale 400\n"
@ -613,7 +646,8 @@ char *particle_set_spikeset =
"r_part te_tarexplosion\n"
"{\n"
"texture \"particles/emp\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"count 120\n"
"scale 35\n"
"die 0.75\n"
@ -636,7 +670,8 @@ char *particle_set_spikeset =
"r_part pe_default\n"
"{\n"
"texture \"particles/quake\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"count 1\n"
"scale 4\n"
"veladd 15\n"
@ -649,7 +684,8 @@ char *particle_set_spikeset =
"r_part pe_defaulttrail\n"
"{\n"
"texture \"particles/quake\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"step 12\n"
"die 1\n"
"scale 10\n"
@ -661,7 +697,8 @@ char *particle_set_spikeset =
"r_part pe_pointfile\n"
"{\n"
"texture \"particles/quake\"\n"
"texture \"particles/fteparticlefont.tga\"\n"
"tcoords 1 97 95 191 256\n"
"count 1\n"
"scale 50\n"
"die 30\n"
@ -676,6 +713,10 @@ char *particle_set_spikeset =
"r_effect \"progs/flame.mdl\" cu_torch\n"
"r_trail \"progs/e_spike1.mdl\" te_railtrail\n";
///////////////////////////////////////////////////////
char *particle_set_faithful =
// faithful, by TimeServ
"r_part t_gib\n"