Skip to content

Commit

Permalink
adjust
Browse files Browse the repository at this point in the history
  • Loading branch information
hspencer committed May 19, 2021
1 parent cb9fd84 commit e85663e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"query":{"printrequests":[{"label":"","key":"","redi":"","typeid":"_wpg","mode":2},{"label":"Nota","key":"Nota","redi":"","typeid":"_txt","mode":1,"format":""},{"label":"Autor","key":"Autor","redi":"","typeid":"_wpg","mode":1,"format":""},{"label":"Posici\u00f3n","key":"Posici\u00f3n","redi":"","typeid":"_geo","mode":1,"format":""},{"label":"Imagen","key":"Imagen","redi":"","typeid":"_txt","mode":1,"format":""}],"results":{"Aguas claras":{"printouts":{"Nota":["El agua sube silenciosa reflejando el cielo."],"Autor":[{"fulltext":"Herbert Spencer","fullurl":"https://wiki.ead.pucv.cl/Herbert_Spencer","namespace":0,"exists":"1","displaytitle":""}],"Posici\u00f3n":[{"lat":-32.97019,"lon":-71.3843}],"Imagen":["2020722-151322.png"]},"fulltext":"Aguas claras","fullurl":"https://wiki.ead.pucv.cl/Aguas_claras","namespace":0,"exists":"1","displaytitle":""},"Alma Infinita":{"printouts":{"Nota":["\u00bfCu\u00e1l es el alba perpetua de tu origen?"],"Autor":[{"fulltext":"Carlos Covarrubias","fullurl":"https://wiki.ead.pucv.cl/Carlos_Covarrubias","namespace":0,"exists":"1","displaytitle":""}],"Posici\u00f3n":[{"lat":-30.7342,"lon":-71.31509}],"Imagen":[]},"fulltext":"Alma Infinita","fullurl":"https://wiki.ead.pucv.cl/Alma_Infinita","namespace":0,"exists":"1","displaytitle":""},"Amanecer":{"printouts":{"Nota":["Temprano lucen las directrices."],"Autor":[{"fulltext":"Manuel Sanfuentes","fullurl":"https://wiki.ead.pucv.cl/Manuel_Sanfuentes","namespace":0,"exists":"1","displaytitle":""}],"Posici\u00f3n":[{"lat":-32.8904,"lon":-71.5058}],"Imagen":[]},"fulltext":"Amanecer","fullurl":"https://wiki.ead.pucv.cl/Amanecer","namespace":0,"exists":"1","displaytitle":""},"El megaterio renace":{"printouts":{"Nota":["El esqueleto de piedra es nuevo otra vez"],"Autor":[{"fulltext":"Jaime Reyes","fullurl":"https://wiki.ead.pucv.cl/Jaime_Reyes","namespace":0,"exists":"1","displaytitle":""}],"Posici\u00f3n":[{"lat":-32.89105,"lon":-71.49819}],"Imagen":[]},"fulltext":"El megaterio renace","fullurl":"https://wiki.ead.pucv.cl/El_megaterio_renace","namespace":0,"exists":"1","displaytitle":""},"La cima del s\u00e9nit":{"printouts":{"Nota":["Pares dispersos haciendo se\u00f1as de lejos."],"Autor":[{"fulltext":"An\u00f3nimo","fullurl":"https://wiki.ead.pucv.cl/An%C3%B3nimo","namespace":0,"exists":"","displaytitle":""}],"Posici\u00f3n":[{"lat":-32.97014,"lon":-71.52868}],"Imagen":["2020722-193312.png"]},"fulltext":"La cima del s\u00e9nit","fullurl":"https://wiki.ead.pucv.cl/La_cima_del_s%C3%A9nit","namespace":0,"exists":"1","displaytitle":""},"\u00c1rbol":{"printouts":{"Nota":["\u00c1rbol que esconde lo distinto."],"Autor":[{"fulltext":"Isabel Margarita Reyes","fullurl":"https://wiki.ead.pucv.cl/Isabel_Margarita_Reyes","namespace":0,"exists":"1","displaytitle":""}],"Posici\u00f3n":[{"lat":-33.01598,"lon":-71.53812}],"Imagen":[]},"fulltext":"\u00c1rbol","fullurl":"https://wiki.ead.pucv.cl/%C3%81rbol","namespace":0,"exists":"1","displaytitle":""}},"serializer":"SMW\\Serializers\\QueryResultSerializer","version":2,"meta":{"hash":"45894c98fb553ab0570693f9177bb477","count":6,"offset":0,"source":"","time":"0.013259"}}}
7 changes: 4 additions & 3 deletions note.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Note {
this.over = false;
this.touched = false;
this.angle;
this.col = nodeColor();
let options = {
friction: 0,
restitution: 0.77,
Expand Down Expand Up @@ -49,7 +50,7 @@ class Note {
g.line(this.px, this.py, this.x, this.y);
g.blendMode(BLEND);
if (this.over) {
fill(180, 30, 0, 45);
fill(this.col);
noStroke();
ellipse(0, 0, this.r * 2);
stroke(0);
Expand All @@ -73,14 +74,14 @@ class Note {
}else{
stroke(0, 45);
strokeWeight(1.5);
fill(0, 125);
fill(this.col);
ellipse(0, 0, this.r * 2);
}
}
pop();
if (this.creatingSpring) {
// paint growing circle
g.fill(0, 25);
g.fill(this.col);
g.blendMode(MULTIPLY);
g.stroke(0, 5);
g.ellipse(this.x, this.y, this.springDist * 2);
Expand Down
6 changes: 6 additions & 0 deletions sketch.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,10 @@ function updateGraphics() {
g.noStroke();
g.rect(0, 0, w, h);
g.blendMode(BLEND);
}


function nodeColor(){
let col = color(random(250, 255), random(250, 255), random(250, 255));
return col;
}

0 comments on commit e85663e

Please sign in to comment.