Skip to content

updating for 2.0 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shiffman wants to merge 4 commits into
base: master
Choose a base branch
from
Open

updating for 2.0 #5

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0136ad
changing size() for 2.0 compatability
shiffman Jul 12, 2013
6dbf68e
fixes for Processing 3
shiffman Oct 23, 2015
24a49a0
resolving merge conflicts
shiffman Oct 23, 2015
45a0ed9
smooth is default and no need for opengl import statement
shiffman Oct 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions Kepler2012/Kepler2012.pde
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
*/

// Import libraries
import processing.opengl.*;
PFont label = createFont("Helvetica", 96);
PFont label;

// Here's the big list that will hold all of our planets
ArrayList<ExoPlanet> planets = new ArrayList();
Expand Down Expand Up @@ -52,18 +51,19 @@ int showControls;
boolean draggingZoomSlider = false;

void setup() {
size(displayWidth, displayHeight, OPENGL);
fullScreen(P3D);
background(0);
smooth();

label = createFont("Helvetica", 96);

textFont(label, 96);

// Because NASA released their data from 2011 and 2012 in somewhat
// different formats, there are two functions to load the data and populate
// the 'galaxy'.
getPlanets(sketchPath + "/data/KeplerData.csv", false);
getPlanets("KeplerData.csv", false);
println(planets.size());
getPlanets(sketchPath + "/data/planets2012_2.csv", true);
getPlanets("planets2012_2.csv", true);
println(planets.size());
addMarkerPlanets();
updatePlanetColors();
Expand Down Expand Up @@ -396,7 +396,4 @@ void toggleFlatness(float f) {

void mouseReleased() {
draggingZoomSlider = false;
}



}