Author: paperwing
Date: 2012-01-26 15:02:57 -0800 (Thu, 26 Jan 2012)
New Revision: 28124
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/geometric/Vector3.java
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
Log:
in process of implementing sparse edge coordinate generation, which is governed
by the desired distance between points on the arc for equal-length dashes
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/geometric/Vector3.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/geometric/Vector3.java
2012-01-26 22:45:49 UTC (rev 28123)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/geometric/Vector3.java
2012-01-26 23:02:57 UTC (rev 28124)
@@ -345,7 +345,16 @@
}
- // Removed requirement for this vector to be perpendicular to the given
normal
+ /**
+ * Rotates this vector about the axis specified by the normal vector,
+ * by a specified angle, in accordance with the right-hand rule .
+ *
+ * @param normal The normal vector used to perform the rotation
+ * @param angle The angle, in radians, to rotate about the normal in
+ * in accordance with the right-hand rule (thumb points along direction
+ * of normal).
+ * @return The rotated vector.
+ */
public Vector3 rotate(Vector3 normal, double angle) {
// Parametric equation for circle in 3D space:
// P = Rcos(t)u + Rsin(t)nxu + c
Modified:
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
===================================================================
---
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-01-26 22:45:49 UTC (rev 28123)
+++
csplugins/trunk/toronto/yuedong/paperwing-impl/src/main/java/org/cytoscape/paperwing/internal/rendering/RenderArcEdgesProcedure.java
2012-01-26 23:02:57 UTC (rev 28124)
@@ -295,6 +295,12 @@
return arcCoordinates;
}
+ // Generate points along the arc, governed by the distance between
points on the arc
+ private Vector3[] generateSparseArcCoordinates(Vector3 start, Vector3
end,
+ double radius, double angle, double distance) {
+ return new Vector3[1];
+ }
+
/**
* Finds the center of a circle passing through 2 points, rotated about
the displacement axis
* by a certain angle.
@@ -353,4 +359,8 @@
gl.glPopMatrix();
}
}
+
+ private void drawSpacedArc(GL2 gl, Vector3[] points) {
+
+ }
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
