Commit 3164f629 authored by Philip Levis's avatar Philip Levis
Browse files

Fix Panel to show all Layout controls.

parent 3dbb309c
......@@ -75,7 +75,6 @@ void initializeModel() {
}
List<LightSamplePoint> bodyLights = model.getAllBodyLights();
for (LightSamplePoint light: bodyLights) {
System.out.println(light);
light.setColor(LXColor.hsb(0.7, 0.5, 0.8));
}
} catch (Exception e) {
......@@ -88,7 +87,7 @@ void initializeModel() {
void setup() {
frameRate(90);
System.out.println("Starting LXStudio and Initialized Fractal Flyer data model from " + Config.FLYER_CONFIG_FILE);
System.out.println("Starting LXStudio; initialized Fractal Flyer data model from " + Config.FLYER_CONFIG_FILE);
IO io = new IO(sketchPath());
flyerConfigurations = io.loadConfigFile(Config.FLYER_CONFIG_FILE);
initializeModel();
......
......@@ -2,7 +2,7 @@ import java.util.List;
class UIFlyerConfiguration extends UIWindow {
final static int WIDTH = 140;
final static int HEIGHT = 360;
final static int HEIGHT = 420;
final static int BORDER = 4;
final static int ROW_HEIGHT = 28;
private UIButton enableButton;
......@@ -162,7 +162,7 @@ class UIFlyerConfiguration extends UIWindow {
}
private void makeTiltSlider() {
BoundedParameter tilt = new BoundedParameter("Tilt", 0, 1);
BoundedParameter tilt = new BoundedParameter("Tilt", 0, 20);
this.tiltSlider = new UISlider(0, 0, 0, 16) {
public void onParameterChanged(LXParameter parameter) {
flyerHighlighter.getConfig().tilt = parameter.getValuef();
......@@ -172,7 +172,7 @@ class UIFlyerConfiguration extends UIWindow {
this.tiltSlider.setParameter(tilt);
}
private void makeDirectionSlider() {
BoundedParameter direction = new BoundedParameter("Rotation", 0, 1);
BoundedParameter direction = new BoundedParameter("Rotation", 0, 360);
this.directionSlider = new UISlider(0, 0, 0, 16) {
public void onParameterChanged(LXParameter parameter) {
flyerHighlighter.getConfig().rotation = parameter.getValuef();
......
......@@ -67,7 +67,6 @@ class Model implements GeometryConstants {
WingModel l = wings.get(i * 2);
WingModel r = wings.get(i * 2 + 1);
LightSamplePointModel body = lights.get(bodyLightIndex(i));
System.out.println("Making Flyer " + i + " with body light " + body);
FlyerModel f = new FlyerModel(flyerConfigs[i],
l,
r,
......@@ -114,14 +113,9 @@ class FlightModel extends LXModel implements Flight {
}
LightSamplePoint bodyLightPoint = (LightSamplePoint) flyer.getBodyLightPoint();
System.out.println("Adding body light " + bodyLightPoint);
lightPoints[bodyLightPoint.getIndex()] = bodyLightPoint;
}
System.out.println("Made lights in model");
for (int i = 0; i < lightPoints.length; i++) {
System.out.println("[" + i + "] -> " + lightPoints[i]);
}
}
/* ------------- all flyers, motion ------------- */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment