SF.net SVN: bzflag:[22765] trunk/bzflag

[<bul...@us...>]

Revision: 22765
          http://sourceforge.net/p/bzflag/code/22765
Author:   bullet_catcher
Date:     2013-05-18 22:11:53 +0000 (Sat, 18 May 2013)
Log Message:
-----------
Simplify experimental quality laser bolt coloring to preserve const quality.
Remove no-longer-needed vector rgb() methods.

Modified Paths:
--------------
    trunk/bzflag/include/vectors.h
    trunk/bzflag/src/geometry/LaserSceneNode.cxx

Modified: trunk/bzflag/include/vectors.h
===================================================================
--- trunk/bzflag/include/vectors.h	2013-05-18 20:19:54 UTC (rev 22764)
+++ trunk/bzflag/include/vectors.h	2013-05-18 22:11:53 UTC (rev 22765)
@@ -377,8 +377,6 @@
     inline const vec3<T>& xyz() const { return *(new((void*)&x) vec3<T>(false)); }
     inline       vec3<T>& yzw()       { return *(new((void*)&y) vec3<T>(false)); }
     inline const vec3<T>& yzw() const { return *(new((void*)&y) vec3<T>(false)); }
-    inline       vec3<T>& rgb()       { return xyz(); }
-    inline const vec3<T>& rgb() const { return xyz(); }
 
     vec4& operator+=(const vec4& v) { x += v.x; y += v.y; z += v.z; w += v.w; return *this; }
     vec4& operator-=(const vec4& v) { x -= v.x; y -= v.y; z -= v.z; w -= v.w; return *this; }

Modified: trunk/bzflag/src/geometry/LaserSceneNode.cxx
===================================================================
--- trunk/bzflag/src/geometry/LaserSceneNode.cxx	2013-05-18 20:19:54 UTC (rev 22764)
+++ trunk/bzflag/src/geometry/LaserSceneNode.cxx	2013-05-18 22:11:53 UTC (rev 22765)
@@ -163,26 +163,28 @@
 
 	GLUquadric *q = gluNewQuadric();
 
-	const fvec4& centerColor = sceneNode->centerColor;
-	const fvec4& color       = sceneNode->color;
+	fvec4 centerColor = sceneNode->centerColor;
+	centerColor.a     = 0.85f;
+	fvec4 color       = sceneNode->color;
+	color.a           = 0.125f;
 
-	myColor4fv(fvec4(centerColor.rgb(), 0.85f));
+	myColor4fv(centerColor);
 	gluCylinder(q, 0.0625f, 0.0625f, length, 10, 1);
 	addTriangleCount(20);
 
-	myColor4fv(fvec4(color.rgb(), 0.125f));
+	myColor4fv(color);
 	gluCylinder(q, 0.1f, 0.1f, length, 16, 1);
 	addTriangleCount(32);
 
-	myColor4fv(fvec4(color.rgb(), 0.125f));
+	myColor4fv(color);
 	gluCylinder(q, 0.2f, 0.2f, length, 24, 1);
 	addTriangleCount(48);
 
-	myColor4fv(fvec4(color.rgb(), 0.125f));
+	myColor4fv(color);
 	gluCylinder(q, 0.4f, 0.4f, length, 32, 1);
 	addTriangleCount(64);
 
-	myColor4fv(fvec4(color.rgb(), 0.125f));
+	myColor4fv(color);
 	if (sceneNode->first) {
 		gluSphere(q, 0.5f, 32, 32);
 		addTriangleCount(32 * 32 * 2);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.