Skip to content

Commit

Permalink
DONE. PROJECT DONE.
Browse files Browse the repository at this point in the history
  • Loading branch information
sherbondy committed Dec 9, 2010
1 parent be99203 commit b2c9683
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
4 changes: 2 additions & 2 deletions boogie.pde
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ colors.add(color(213, 174, 49)); // yellow
color bkgd = color(202, 204, 201);
color yellow = color(213, 174, 49);

int complexity = int(random(1, 4));
int thickness = int(random(1,4));
var complexity = $(document).data("complexity");
var thickness = $(document).data("thickness");

void illus() {
var w = $(document).data("width");
Expand Down
4 changes: 2 additions & 2 deletions color_a.pde
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ colors.add(color(96, 90, 126)); // purple

color black = color(44, 26, 12);

int complexity = int(random(1, 4));
int thickness = int(random(1,4));
var complexity = $(document).data("complexity");
var thickness = $(document).data("thickness");

void illus() {
var w = $(document).data("width");
Expand Down
4 changes: 2 additions & 2 deletions composition.pde
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ colors.add(color(18, 13, 10)); // black
colors.add(color(187, 189, 194)); // grey
colors.add(color(255,255,255)); // white

int complexity = int(random(1, 4));
int thickness = int(random(1,4));
var complexity = $(document).data("complexity");
var thickness = $(document).data("thickness");

void illus() {
var w = $(document).data("width");
Expand Down
9 changes: 8 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@
for(i=results.rows.length-1; i>=0; i--) {
var li = '<li><h3>'+unescape(results.rows.item(i).title)
+'<span class="clicks">'+results.rows.item(i).clicks+' clicks</span></h3>'
+'<img src="'+unescape(results.rows.item(i).src)+'"';
if (results.rows.item(i).title.toLowerCase() == "piet" ||
results.rows.item(i).title.toLowerCase() == "mondrian") {
li += '<img src="piet.jpg"';
} else {
li += '<img src="'+unescape(results.rows.item(i).src)+'"';
}
if (results.rows.item(i).rotate == "true") {
li += ' class="rotate"';
}
Expand Down Expand Up @@ -198,6 +203,8 @@
});

$("#images a").click(function() {
$("#image_src").removeClass("rotate");

var source = document.getElementById($(this).attr("href").slice(1)).toDataURL();
$("#image_src").attr("src", source);
if ($($(this).attr("href")).hasClass("rotate")) {
Expand Down
4 changes: 2 additions & 2 deletions new_york_creater.pde
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
int complexity = int(random(1, 4));
int thickness = int(random(1,4));
var complexity = $(document).data("complexity");
var thickness = $(document).data("thickness");

void illus()
{
Expand Down
Binary file added piet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b2c9683

Please sign in to comment.