]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Set maxthickness based on beam type
authorSamual Lenks <samual@xonotic.org>
Wed, 19 Feb 2014 01:46:04 +0000 (20:46 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 19 Feb 2014 01:46:04 +0000 (20:46 -0500)
qcsrc/client/particles.qc

index eb449cab11aba5f4c7e4e5d219cb563d7dd0780a..7fac7f9d0e8537b2fd05f9033d4400b9e44474dc 100644 (file)
@@ -473,7 +473,7 @@ void Draw_ArcBeam()
        vector beam_endpos_estimate = (start_pos + (beamdir * self.beam_range));
 
        float segments = 20; // todo: calculate this in a similar way to server does
-       float maxthickness = 8;
+       float maxthickness = self.beam_thickness;
 
        vector thickdir = normalize(cross(beamdir, view_origin - start_pos));
 
@@ -528,7 +528,7 @@ void Draw_ArcBeam()
                vector top    = hitorigin + (thickdir * self.beam_thickness);
                vector bottom = hitorigin - (thickdir * self.beam_thickness);
 
-               R_BeginPolygon(self.beam_image, DRAWFLAG_NORMAL);
+               R_BeginPolygon(self.beam_image, DRAWFLAG_NORMAL); // DRAWFLAG_ADDITIVE
                R_PolygonVertex(top,         '0 0.5 0' + ('0 0.5 0' * (self.beam_thickness / maxthickness)), self.beam_rgb, self.beam_alpha);
                R_PolygonVertex(last_top,    '0 0.5 0' + ('0 0.5 0' * (lastthickness / maxthickness)), self.beam_rgb, self.beam_alpha);
                R_PolygonVertex(last_bottom, '0 0.5 0' * (1 - (lastthickness / maxthickness)),         self.beam_rgb, self.beam_alpha);