Skip to content

Commit

Permalink
Sixth principle done
Browse files Browse the repository at this point in the history
  • Loading branch information
@marianaviro
marianaviro committed Jun 1, 2018
1 parent 06a0142 commit dd7fb16
Show file tree
Hide file tree
Showing 17 changed files with 1,585 additions and 63 deletions.
Binary file added assets/RealMen.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/WomanPower.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions collective_challenges.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
var colective_challenges = [
{
"name": "Siete Polas"
},
{
"name": "Chicas Poderosas"
},
{
"name": "Niñas sin miedo"
},
{
"name": "Fondo lunaria"
},
{
"name": "Gordas sin chaqueta"
},
{
"name": "Colectiva Polimorfas"
},
{
"name": "Colectiva Libertaria Severas Flores"
},
{
"name": "Sisma Mujer"
},
{
"name": "La Mesa por la Vida y la Salud de las mujeres"
},
{
"name": "Las Parceras – Línea y Red Feminista de Acompañamiento en Aborto"
},
{
"name": "La Tremenda Revoltosa – Batucada Feminista"
},
{
"name": "La Morada"
},
{
"name": "Atrévete Bogotá Hollback!"
},
{
"name": "Observatorio Contra el Acoso Callejero"
},
{
"name": "Yerbateras"
},
{
"name": "Yela Quim"
},
{
"name": "MyGRLStory"
}
];
19 changes: 19 additions & 0 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.1/p5.js"></script>
<script src="lib/p5.dom.js"></script>
<script src="projects.js"></script>
<script src="private_challenges.js"></script>
<script src="collective_challenges.js"></script>
<script src="home.js"></script>
<script src="intro.js"></script>
<script src="tutorial.js"></script>
Expand All @@ -18,6 +20,12 @@
<script src="p4_1.js"></script>
<script src="p4_2.js"></script>
<script src="p4_3.js"></script>
<script src="p5_1.js"></script>
<script src="p5_2.js"></script>
<script src="p6_1.js"></script>
<script src="p6_2.js"></script>
<script src="p6_3.js"></script>
<script src="p6_4.js"></script>
<link rel="stylesheet" type="text/css" href="style.css">
</head>
<body>
Expand Down Expand Up @@ -50,6 +58,17 @@
</div>
<div class="principle" id="p4_3">
</div>
<div class="principle" id="p5_1">
</div>
<div class="principle" id="p5_2">
</div>
<div class="principle" id="p6_1">
</div>
<div class="principle" id="p6_2">
</div>
<div class="principle" id="p6_3">
</div>
<div class="principle" id="p6_4">
</div>
</body>
</html>
6 changes: 0 additions & 6 deletions p1_1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ var p1_1 = function(s) {
s.strokeWeight(20);
s.rect(s.windowWidth/2 - 110, s.windowHeight/2 - 160, 210, 300);

//Rectangle
s.fill('#FF83FF');
s.noStroke();
s.strokeWeight(20);
s.rect(s.windowWidth/2 - 110, s.windowHeight/2 - 160, 210, 300);

//Principle
s.noStroke();
s.textFont('Futura');
Expand Down
1 change: 0 additions & 1 deletion p3_1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ var p3_1 = function(s) {
//Rectangle
s.fill('#04E973');
s.text('P R I N C I P I O # 3', s.windowWidth/2 - 75, s.windowHeight/2 - 170);
s.strokeWeight(20);
s.rect(s.windowWidth/2 - 110, s.windowHeight/2 - 160, 210, 300);

//Principle
Expand Down
5 changes: 3 additions & 2 deletions p4_1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ var p4_1 = function(s) {
var x2 = s.windowWidth/2 + 100;
var y1 = s.windowHeight/2 - 160;
var y2 = s.windowHeight/2 + 140;
var m = s.map(s.mouseY, s.windowHeight, 0, -5, 110);
var mo = s.constrain(s.mouseY, 0, s.windowHeight);
var m = s.map(mo, s.windowHeight, 0, -5, 110);

//Right arc
s.beginShape();
Expand All @@ -72,7 +73,7 @@ var p4_1 = function(s) {
s.bezierVertex(x1 - m, y1, x1 - m, y2, x1 + m, y2);
s.endShape();

//Midle rectangle
//Middle rectangle
s.rect(x1 + m, y1, x2 - x1 - (2*m), 300);

//Principle
Expand Down
36 changes: 18 additions & 18 deletions p4_2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,43 +76,43 @@ var p4_2 = function(s) {
s.text('La lucha feminista ha sido acusada de ser demasiado emocional en sus manifestaciones. Aunque esta percepción probablemente se deriva de estereotipos que presionan a las mujeres a ser sumisas y a no ser vehementes, es cierto que al interior de los feminismos se presentan emociones fuertes que surgen a partir de las experiencias injustas y violentas que han vivido las víctimas. Es apenas natural –y en mi opinión, necesario– que las emociones tengan un papel protagónico en las luchas feministas, pues esto permite la comprensión sensible de las posiciones de otros, genera empatía entre las personas y permite hacer catarsis de las injusticias que hemos vivido.', s.windowWidth/3 - 50, s.windowHeight/4 + 330, 610, 600);

//Arrow
var mx = s.windowWidth - 60;
var my = s.windowHeight/2 - 10;

var mx = s.windowWidth/2 - 10;
var my = s.windowHeight - 60;
s.fill(arrowColor);
s.noStroke();
s.beginShape();
s.vertex(mx, my);
s.vertex(mx, my - 20);
s.vertex(mx + 20, my - 20);
s.vertex(mx + 20, my - 30);
s.vertex(mx + 40, my - 10);
s.vertex(mx + 20, my + 10);
s.vertex(mx + 20, my);
s.vertex(mx + 20, my + 20);
s.vertex(mx + 30, my + 20);
s.vertex(mx + 10, my + 40);
s.vertex(mx - 10, my + 20);
s.vertex(mx, my + 20);
s.vertex(mx, my);
s.endShape(s.CLOSE);
}
};

s.mouseInsideArrow = function() {
var mx = s.windowWidth - 60;
var my = s.windowHeight/2 - 10;
var mx = s.windowWidth/2 - 10;;
var my = s.windowHeight - 60;

//Check if the mouse is inside the arrow's rectangle
var dx = s.mouseX - mx;
var dy = s.mouseY - my;
if(0 < dx && dx < 20 && -20 < dy && dy < 0) {
if(0 < dx && dx < 20 && 0 < dy && dy < 20) {
return true;
} else {
//Check if the mouse is inside the arrow's lower triangle
var lx = 20 - Math.abs(s.mouseX - mx - 20);
var ly = Math.abs(s.mouseY - my + 10);
//Check if the mouse is inside the arrow's left triangle
var lx = Math.abs(s.mouseX - mx + 10);
var ly = Math.abs(s.mouseY - my - 20);
if(lx < 20 && ly < 20 && lx > ly) {
return true;
} else {
//Check if the mouse is inside the arrow's upper triangle
var ux = 20 - Math.abs(s.mouseX - mx - 20);
var uy = Math.abs(s.mouseY - my + 20);
if(ux < 20 && uy < 20 && ux > uy) {
//Check if the mouse is inside the arrow's right triangle
var rx = 20 - Math.abs(s.mouseX - mx - 10);
var ry = Math.abs(s.mouseY - my - 20);
if(rx < 20 && ry < 20 && rx > ry) {
return true;
}
return false;
Expand Down
70 changes: 35 additions & 35 deletions p4_3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,50 @@ var p4_3 = function(s) {
s.text('Algunos relacionan el presunto exceso de sensibilidad con una falta de racionalidad en el movimiento, acusándolo así de no ser pertinente en discusiones políticas. Dejando para otro espacio la discusión sobre si lo emocional es pertinente o no en la política –yo creo que sí–, es importante hacer notar los aportes teóricos de feministas a áreas del conocimiento como el derecho, la ciencia política, la filosofía y muchas otras más. Estos aportes se han hecho desde lo académico y desde lo profesional, lo cual ha incidido en las transformaciones sociales, económicas, políticas y culturales de muchos países hacia una sociedad igualitaria en todos los ámbitos de la vida en sociedad.', s.windowWidth/3 - 50, s.windowHeight/4 + 330, 610, 600);

//Arrow
var mx = s.windowWidth/2 - 10;
var my = s.windowHeight - 60;
var mx = s.windowWidth - 60;
var my = s.windowHeight/2 - 10;

s.fill(arrowColor);
s.noStroke();
s.beginShape();
s.vertex(mx, my);
s.vertex(mx, my - 20);
s.vertex(mx + 20, my - 20);
s.vertex(mx + 20, my - 30);
s.vertex(mx + 40, my - 10);
s.vertex(mx + 20, my + 10);
s.vertex(mx + 20, my);
s.vertex(mx + 20, my + 20);
s.vertex(mx + 30, my + 20);
s.vertex(mx + 10, my + 40);
s.vertex(mx - 10, my + 20);
s.vertex(mx, my + 20);
s.vertex(mx, my);
s.endShape(s.CLOSE);
}
};

s.mouseInsideArrow = function() {
var mx = s.windowWidth - 60;
var my = s.windowHeight/2 - 10;

//Check if the mouse is inside the arrow's rectangle
var dx = s.mouseX - mx;
var dy = s.mouseY - my;
if(0 < dx && dx < 20 && -20 < dy && dy < 0) {
return true;
} else {
//Check if the mouse is inside the arrow's lower triangle
var lx = 20 - Math.abs(s.mouseX - mx - 20);
var ly = Math.abs(s.mouseY - my + 10);
if(lx < 20 && ly < 20 && lx > ly) {
return true;
} else {
//Check if the mouse is inside the arrow's upper triangle
var ux = 20 - Math.abs(s.mouseX - mx - 20);
var uy = Math.abs(s.mouseY - my + 20);
if(ux < 20 && uy < 20 && ux > uy) {
return true;
}
return false;
}
}
};

s.mouseInsideHome = function() {
var hx1 = s.windowWidth/2 - 110;
var hx2 = s.windowWidth/2 - 50;
Expand All @@ -115,33 +142,6 @@ var p4_3 = function(s) {
}
};

s.mouseInsideArrow = function() {
var mx = s.windowWidth/2 - 10;;
var my = s.windowHeight - 60;

//Check if the mouse is inside the arrow's rectangle
var dx = s.mouseX - mx;
var dy = s.mouseY - my;
if(0 < dx && dx < 20 && 0 < dy && dy < 20) {
return true;
} else {
//Check if the mouse is inside the arrow's left triangle
var lx = Math.abs(s.mouseX - mx + 10);
var ly = Math.abs(s.mouseY - my - 20);
if(lx < 20 && ly < 20 && lx > ly) {
return true;
} else {
//Check if the mouse is inside the arrow's right triangle
var rx = 20 - Math.abs(s.mouseX - mx - 10);
var ry = Math.abs(s.mouseY - my - 20);
if(rx < 20 && ry < 20 && rx > ry) {
return true;
}
return false;
}
}
};

s.mouseClicked = function() {
if(s.mouseInsideArrow()){
s.next();
Expand Down
Loading

0 comments on commit dd7fb16

Please sign in to comment.