Cube  Diff

Differences From Artifact [21833af7d6]:

To Artifact [4855ce96c9]:


1
2
3
4
5
6
7






8
9
10
11

12

13

14
15

16
17
18
19
20
21
22
23
24








25
26
27
28
29
30
31
32
33
34
35










36
37
38
39

40
41
42

43
44
45








46
47

48
49

50
51
52
53
54
55
56
57
58






59
60
61
62
63
64
65
66
67
68
69
70
71
72
73


















74
75

76
77
78
79
80
81
82
83
84
85
86
87
88
























89
90

91
92
93
94



95
96

97
98
99
100
101
102
103
104
105










106
107
108
109



110
111

112

113
114
115
116
117
118





119
120
121
122



123
124
125
126
127




128
129

130

131
132
133
134
135
136
137
138
139
140










141
142
1
2
3
4
5
6

7
8
9
10
11
12
13
14
15

16
17
18

19
20

21









22
23
24
25
26
27
28
29











30
31
32
33
34
35
36
37
38
39
40
41
42

43
44
45
46
47



48
49
50
51
52
53
54
55
56

57


58
59
60
61






62
63
64
65
66
67















68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85


86
87












88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112

113




114
115
116


117









118
119
120
121
122
123
124
125
126
127
128



129
130
131
132
133
134

135
136





137
138
139
140
141




142
143
144





145
146
147
148
149
150
151

152
153









154
155
156
157
158
159
160
161
162
163
164







-
+
+
+
+
+
+



-
+

+
-
+

-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+



-
+



+
-
-
-
+
+
+
+
+
+
+
+

-
+
-
-
+



-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+

-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

-
+
-
-
-
-
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+

-
-
-
+
+
+


+
-
+

-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+


+
-
+

-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+

-
// renderparticles.cpp

#include "cube.h"

const int MAXPARTICLES = 10500;
const int NUMPARTCUTOFF = 20;
struct particle { vec o, d; int fade, type; int millis; particle *next; };
struct particle {
	vec o, d;
	int fade, type;
	int millis;
	particle *next;
};
particle particles[MAXPARTICLES], *parlist = NULL, *parempty = NULL;
bool parinit = false;

VARP(maxparticles, 100, 2000, MAXPARTICLES-500);
VARP(maxparticles, 100, 2000, MAXPARTICLES - 500);

void
void newparticle(vec &o, vec &d, int fade, int type)
newparticle(vec &o, vec &d, int fade, int type)
{
    if(!parinit)
	if (!parinit) {
    {
        loopi(MAXPARTICLES)
        {
            particles[i].next = parempty;
            parempty = &particles[i];
        };
        parinit = true;
    };
    if(parempty)
		loopi(MAXPARTICLES)
		{
			particles[i].next = parempty;
			parempty = &particles[i];
		};
		parinit = true;
	};
	if (parempty) {
    {
        particle *p = parempty;
        parempty = p->next;
        p->o = o;
        p->d = d;
        p->fade = fade;
        p->type = type;
        p->millis = lastmillis;
        p->next = parlist;
        parlist = p;
    };
		particle *p = parempty;
		parempty = p->next;
		p->o = o;
		p->d = d;
		p->fade = fade;
		p->type = type;
		p->millis = lastmillis;
		p->next = parlist;
		parlist = p;
	};
};

VAR(demotracking, 0, 0, 1);
VARP(particlesize, 20, 100, 500); 
VARP(particlesize, 20, 100, 500);

vec right, up;

void
void setorient(vec &r, vec &u) { right = r; up = u; };

void render_particles(int time)
setorient(vec &r, vec &u)
{
	right = r;
	up = u;
};

void
render_particles(int time)
{
	if(demoplayback && demotracking)
	if (demoplayback && demotracking) {
	{
		vec nom = { 0, 0, 0 };
		vec nom = {0, 0, 0};
		newparticle(player1->o, nom, 100000000, 8);
	};

    glDepthMask(GL_FALSE);
    glEnable(GL_BLEND);
    glBlendFunc(GL_SRC_ALPHA, GL_SRC_ALPHA);
    glDisable(GL_FOG);
    
    struct parttype { float r, g, b; int gr, tex; float sz; } parttypes[] =
	glDepthMask(GL_FALSE);
	glEnable(GL_BLEND);
	glBlendFunc(GL_SRC_ALPHA, GL_SRC_ALPHA);
	glDisable(GL_FOG);

	struct parttype {
    {
        { 0.7f, 0.6f, 0.3f, 2,  3, 0.06f }, // yellow: sparks 
        { 0.5f, 0.5f, 0.5f, 20, 7, 0.15f }, // grey:   small smoke
        { 0.2f, 0.2f, 1.0f, 20, 3, 0.08f }, // blue:   edit mode entities
        { 1.0f, 0.1f, 0.1f, 1,  7, 0.06f }, // red:    blood spats
        { 1.0f, 0.8f, 0.8f, 20, 6, 1.2f  }, // yellow: fireball1
        { 0.5f, 0.5f, 0.5f, 20, 7, 0.6f  }, // grey:   big smoke   
        { 1.0f, 1.0f, 1.0f, 20, 8, 1.2f  }, // blue:   fireball2
        { 1.0f, 1.0f, 1.0f, 20, 9, 1.2f  }, // green:  fireball3
        { 1.0f, 0.1f, 0.1f, 0,  7, 0.2f  }, // red:    demotrack
    };
    
    int numrender = 0;
    
    for(particle *p, **pp = &parlist; p = *pp;)
		float r, g, b;
		int gr, tex;
		float sz;
	} parttypes[] = {
	    {0.7f, 0.6f, 0.3f, 2, 3, 0.06f},  // yellow: sparks
	    {0.5f, 0.5f, 0.5f, 20, 7, 0.15f}, // grey:   small smoke
	    {0.2f, 0.2f, 1.0f, 20, 3, 0.08f}, // blue:   edit mode entities
	    {1.0f, 0.1f, 0.1f, 1, 7, 0.06f},  // red:    blood spats
	    {1.0f, 0.8f, 0.8f, 20, 6, 1.2f},  // yellow: fireball1
	    {0.5f, 0.5f, 0.5f, 20, 7, 0.6f},  // grey:   big smoke
	    {1.0f, 1.0f, 1.0f, 20, 8, 1.2f},  // blue:   fireball2
	    {1.0f, 1.0f, 1.0f, 20, 9, 1.2f},  // green:  fireball3
	    {1.0f, 0.1f, 0.1f, 0, 7, 0.2f},   // red:    demotrack
	};

	int numrender = 0;

	for (particle *p, **pp = &parlist; p = *pp;) {
    {       
        parttype *pt = &parttypes[p->type];
		parttype *pt = &parttypes[p->type];

        glBindTexture(GL_TEXTURE_2D, pt->tex);  
        glBegin(GL_QUADS);
        
        glColor3d(pt->r, pt->g, pt->b);
        float sz = pt->sz*particlesize/100.0f; 
        // perf varray?
        glTexCoord2f(0.0, 1.0); glVertex3d(p->o.x+(-right.x+up.x)*sz, p->o.z+(-right.y+up.y)*sz, p->o.y+(-right.z+up.z)*sz);
        glTexCoord2f(1.0, 1.0); glVertex3d(p->o.x+( right.x+up.x)*sz, p->o.z+( right.y+up.y)*sz, p->o.y+( right.z+up.z)*sz);
        glTexCoord2f(1.0, 0.0); glVertex3d(p->o.x+( right.x-up.x)*sz, p->o.z+( right.y-up.y)*sz, p->o.y+( right.z-up.z)*sz);
        glTexCoord2f(0.0, 0.0); glVertex3d(p->o.x+(-right.x-up.x)*sz, p->o.z+(-right.y-up.y)*sz, p->o.y+(-right.z-up.z)*sz);
        glEnd();
        xtraverts += 4;
		glBindTexture(GL_TEXTURE_2D, pt->tex);
		glBegin(GL_QUADS);

		glColor3d(pt->r, pt->g, pt->b);
		float sz = pt->sz * particlesize / 100.0f;
		// perf varray?
		glTexCoord2f(0.0, 1.0);
		glVertex3d(p->o.x + (-right.x + up.x) * sz,
		    p->o.z + (-right.y + up.y) * sz,
		    p->o.y + (-right.z + up.z) * sz);
		glTexCoord2f(1.0, 1.0);
		glVertex3d(p->o.x + (right.x + up.x) * sz,
		    p->o.z + (right.y + up.y) * sz,
		    p->o.y + (right.z + up.z) * sz);
		glTexCoord2f(1.0, 0.0);
		glVertex3d(p->o.x + (right.x - up.x) * sz,
		    p->o.z + (right.y - up.y) * sz,
		    p->o.y + (right.z - up.z) * sz);
		glTexCoord2f(0.0, 0.0);
		glVertex3d(p->o.x + (-right.x - up.x) * sz,
		    p->o.z + (-right.y - up.y) * sz,
		    p->o.y + (-right.z - up.z) * sz);
		glEnd();
		xtraverts += 4;

        if(numrender++>maxparticles || (p->fade -= time)<0)
		if (numrender++ > maxparticles || (p->fade -= time) < 0) {
        {
            *pp = p->next;
            p->next = parempty;
            parempty = p;
			*pp = p->next;
			p->next = parempty;
			parempty = p;
        }
        else
		} else {
        {
			if(pt->gr) p->o.z -= ((lastmillis-p->millis)/3.0f)*curtime/(pt->gr*10000);
            vec a = p->d;
            vmul(a,time);
            vdiv(a,20000.0f);
            vadd(p->o, a);
            pp = &p->next;
        };
    };
			if (pt->gr)
				p->o.z -= ((lastmillis - p->millis) / 3.0f) *
				          curtime / (pt->gr * 10000);
			vec a = p->d;
			vmul(a, time);
			vdiv(a, 20000.0f);
			vadd(p->o, a);
			pp = &p->next;
		};
	};

    glEnable(GL_FOG);
    glDisable(GL_BLEND);
    glDepthMask(GL_TRUE);
	glEnable(GL_FOG);
	glDisable(GL_BLEND);
	glDepthMask(GL_TRUE);
};

void
void particle_splash(int type, int num, int fade, vec &p)
particle_splash(int type, int num, int fade, vec &p)
{
    loopi(num)
    {
        const int radius = type==5 ? 50 : 150;
        int x, y, z;
        do
	loopi(num)
	{
		const int radius = type == 5 ? 50 : 150;
		int x, y, z;
		do {
        {
            x = rnd(radius*2)-radius;
            y = rnd(radius*2)-radius;
            z = rnd(radius*2)-radius;
			x = rnd(radius * 2) - radius;
			y = rnd(radius * 2) - radius;
			z = rnd(radius * 2) - radius;
        }
        while(x*x+y*y+z*z>radius*radius);
        vec d = { (float)x, (float)y, (float)z };
        newparticle(p, d, rnd(fade*3), type);
    };
		} while (x * x + y * y + z * z > radius * radius);
		vec d = {(float)x, (float)y, (float)z};
		newparticle(p, d, rnd(fade * 3), type);
	};
};

void
void particle_trail(int type, int fade, vec &s, vec &e)
particle_trail(int type, int fade, vec &s, vec &e)
{
    vdist(d, v, s, e);
    vdiv(v, d*2+0.1f);
    vec p = s;
    loopi((int)d*2)
    {
        vadd(p, v);
        vec d = { float(rnd(11)-5), float(rnd(11)-5), float(rnd(11)-5) };
        newparticle(p, d, rnd(fade)+fade, type);
    };
	vdist(d, v, s, e);
	vdiv(v, d * 2 + 0.1f);
	vec p = s;
	loopi((int)d * 2)
	{
		vadd(p, v);
		vec d = {
		    float(rnd(11) - 5), float(rnd(11) - 5), float(rnd(11) - 5)};
		newparticle(p, d, rnd(fade) + fade, type);
	};
};