revert 0dbc566: disassociate rnode id and node

another translation table will have to used anyway and this
has potentially breaking behavior depending on the backend

Author: qwx9

draw/drw.h

@@ -49,11 +49,6 @@ struct RNode{
 	float dir[3];
 	float col[4];
 	float len;
-	union{	/* FIXME: yikes, but what alternative? */
-		uchar u[4];
-		float f;
-		ioff i;
-	} id;
 };
 struct REdge{
 	float pos1[3];

fs/gfa.c

@@ -118,9 +118,6 @@ initnodes(ioff nnodes, int *len, ioff *off, ushort *deg)
 		n->eoff = *off++;
 		v.i = *len++;
 		setspectag(TLN, i, v);
-		/* must be untouched in the shader it's passed as a float but specified
-		 * as a uint; due to limitations of integer type handling */
-		r->id.i = i + 1;	/* FIXME: if nn may be not 0, have to put id in elsewhere */
 	}
 }
 
@@ -135,7 +132,7 @@ initedges(ioff nedges, edgeset *eset, ioff *index, ushort *degree)
 	edgeset *h;
 	khint_t k;
 
-		nn = dylen(edges);
+	nn = dylen(edges);
 	nm = nn + 2 * nedges;
 	dyresize(edges, nm);
 	dyresize(redges, nedges + nelem(selbox));

glsl/node.glsl

@@ -50,7 +50,6 @@ in vec2 geom;
 in vec3 pos;
 in vec3 dir;
 in float len;
-in uint id;
 flat out uint idx;
 
 vec2 rotatez(vec2 v, float c, float s){
@@ -61,7 +60,7 @@ void main(){
 	vec2 g = geom * vec2(len, 1.0);
 	vec3 r = vec3(rotatez(g, dir.x, dir.y), 0.0);
 	gl_Position = mvp * vec4(r + pos, 1.0);
-	idx = id;
+	idx = gl_InstanceIndex + 1;
 }
 @end
 
@@ -133,7 +132,6 @@ in vec3 geom;
 in vec3 pos;
 in vec3 dir;
 in float len;
-in uint id;
 flat out uint idx;
 
 vec3 rotate(vec3 v, float c, float s){
@@ -147,7 +145,7 @@ void main(){
 	vec3 g = geom * vec3(len, 1.0, 1.0);
 	vec3 r = rotate(g, dir.x, dir.y);
 	gl_Position = mvp * vec4(r + pos, 1.0);
-	idx = id;
+	idx = gl_InstanceIndex + 1;
 }
 @end