summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bezierstroke.pde4
-rw-r--r--parsecalldata.pde2
-rw-r--r--vodaviz.pde19
3 files changed, 16 insertions, 9 deletions
diff --git a/bezierstroke.pde b/bezierstroke.pde
index 5070f9b..39ad252 100644
--- a/bezierstroke.pde
+++ b/bezierstroke.pde
@@ -62,7 +62,7 @@ class gradientstroke {
noFill();
float spos=0.0;
- float step=.001; //optimise
+ float step=.004; //optimise
//quad corner points
//these are perpedicular on the screen as we are making a gradient line system
@@ -145,7 +145,7 @@ class gradientstroke3D {
noFill();
float spos=0.0;
- float step=.001; //optimise
+ float step=.04; //optimise
//quad corner points
//these are perpedicular on the screen as we are making a gradient line system
diff --git a/parsecalldata.pde b/parsecalldata.pde
index ccedc4f..3c08b33 100644
--- a/parsecalldata.pde
+++ b/parsecalldata.pde
@@ -172,7 +172,7 @@ class calldata {
for (int i=0; i < countries.size(); i++) {
//if (DEBUG) countries.get(i).printOut();
- //countries.get(i).analyse(18.279,746.302,109,374.293); //129.314
+ countries.get(i).analyse(18.279,746.302,109,374.293); //129.314
}
}
diff --git a/vodaviz.pde b/vodaviz.pde
index 3f104a0..f0c8d87 100644
--- a/vodaviz.pde
+++ b/vodaviz.pde
@@ -220,8 +220,8 @@ void setup(){
float bezierfract=0.25;
bstroke = new bezierstroke(startsize,endsize,linewidth,mpfract,raisefract,bezierfract);
- startsize=10;
- endsize=.5;
+ startsize=.2;
+ endsize=.1;
float[] transpos={0.0,0.15,0.85,1.0};
float[] transamt={0.5,0.2,0.2,0.5};
color col=color(0,0,0);
@@ -261,7 +261,7 @@ void draw() {
float hh=getHeight()/2;
if (i==0) {
- image(lightmap,0,0,getWidth(),getHeight());
+ //image(lightmap,0,0,getWidth(),getHeight());
//fill(bg);
//rect(0,0,width,height);
//background(0);
@@ -312,13 +312,13 @@ void draw() {
}
- if (true) { //draw centre lines from countries to ireland
+ if (false) { //draw centre lines from countries to ireland
RPoint Sp=ptrans.form(pnorm.alise(calls.countries.get(i).getcentre()));
RPoint Ep=ptrans.form(pnorm.alise(Ireland.getcentre()));
gstroke.drawstroke(Sp,Ep,fg);
}
- if (false) {
+ if (false) { //draw great circle lines
for (int j=0;j<calls.countries.get(i).calls*.001;j++) {
RPoint s=calls.countries.get(i).getpoint();
RPoint e=Ireland.getpoint();
@@ -336,7 +336,14 @@ void draw() {
}
//println("plotting "+calls.countries.get(i).name+": "+calls.countries.get(i).calls+" calls");
}
-
+
+ if (true) { //draw gradient 3D lines
+ for (int j=0;j<log10(calls.countries.get(i).calls)*10;j++) {
+ RPoint Sp=ptrans.form(pnorm.alise(calls.countries.get(i).getpoint()));
+ RPoint Ep=ptrans.form(pnorm.alise(Ireland.getpoint()));
+ gstroke.drawstroke(Sp,Ep,fg);
+ }
+ }
}
else //draw 2D
{