diff --git a/.DS_Store b/.DS_Store index 9dcd7f7..b34246d 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.idea/misc.xml b/.idea/misc.xml index b8ed7db..6d1c9d7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,12 @@ + + + diff --git a/README.md b/README.md index 2a5e277..68c3418 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ +## this is a fork of the original controlP5 library by Andreas Schlegel +## it provides a pom.xml for maven and can be used as a dependency in maven projects + + + # ControlP5 ControlP5 is a GUI library written by [Andreas Schlegel](http://www.sojamo.de) for the programming environment [Processing](http://www.processing.org). diff --git a/controlp5.iml b/controlp5.iml index 4be5ba9..80dc095 100644 --- a/controlp5.iml +++ b/controlp5.iml @@ -3,7 +3,7 @@ - + diff --git a/out/production/controlp5/sketch/Sketch.class b/out/production/controlp5/sketch/Sketch.class index b571c9e..ee4e017 100644 Binary files a/out/production/controlp5/sketch/Sketch.class and b/out/production/controlp5/sketch/Sketch.class differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6b37d56 --- /dev/null +++ b/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + de.sojamo + controlp5 + 2.2.6 + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000..f9e4264 Binary files /dev/null and b/src/main/java/.DS_Store differ diff --git a/src/controlP5/Accordion.java b/src/main/java/controlP5/Accordion.java similarity index 100% rename from src/controlP5/Accordion.java rename to src/main/java/controlP5/Accordion.java diff --git a/src/controlP5/Background.java b/src/main/java/controlP5/Background.java similarity index 100% rename from src/controlP5/Background.java rename to src/main/java/controlP5/Background.java diff --git a/src/controlP5/Bang.java b/src/main/java/controlP5/Bang.java similarity index 100% rename from src/controlP5/Bang.java rename to src/main/java/controlP5/Bang.java diff --git a/src/controlP5/BitFont.java b/src/main/java/controlP5/BitFont.java similarity index 100% rename from src/controlP5/BitFont.java rename to src/main/java/controlP5/BitFont.java diff --git a/src/controlP5/Button.java b/src/main/java/controlP5/Button.java similarity index 100% rename from src/controlP5/Button.java rename to src/main/java/controlP5/Button.java diff --git a/src/controlP5/ButtonBar.java b/src/main/java/controlP5/ButtonBar.java similarity index 100% rename from src/controlP5/ButtonBar.java rename to src/main/java/controlP5/ButtonBar.java diff --git a/src/controlP5/CColor.java b/src/main/java/controlP5/CColor.java similarity index 100% rename from src/controlP5/CColor.java rename to src/main/java/controlP5/CColor.java diff --git a/src/controlP5/CDrawable.java b/src/main/java/controlP5/CDrawable.java similarity index 100% rename from src/controlP5/CDrawable.java rename to src/main/java/controlP5/CDrawable.java diff --git a/src/controlP5/CP.java b/src/main/java/controlP5/CP.java similarity index 100% rename from src/controlP5/CP.java rename to src/main/java/controlP5/CP.java diff --git a/src/controlP5/CallbackEvent.java b/src/main/java/controlP5/CallbackEvent.java similarity index 100% rename from src/controlP5/CallbackEvent.java rename to src/main/java/controlP5/CallbackEvent.java diff --git a/src/controlP5/CallbackListener.java b/src/main/java/controlP5/CallbackListener.java similarity index 100% rename from src/controlP5/CallbackListener.java rename to src/main/java/controlP5/CallbackListener.java diff --git a/src/controlP5/Canvas.java b/src/main/java/controlP5/Canvas.java similarity index 100% rename from src/controlP5/Canvas.java rename to src/main/java/controlP5/Canvas.java diff --git a/src/controlP5/Chart.java b/src/main/java/controlP5/Chart.java similarity index 100% rename from src/controlP5/Chart.java rename to src/main/java/controlP5/Chart.java diff --git a/src/controlP5/ChartData.java b/src/main/java/controlP5/ChartData.java similarity index 100% rename from src/controlP5/ChartData.java rename to src/main/java/controlP5/ChartData.java diff --git a/src/controlP5/ChartDataSet.java b/src/main/java/controlP5/ChartDataSet.java similarity index 100% rename from src/controlP5/ChartDataSet.java rename to src/main/java/controlP5/ChartDataSet.java diff --git a/src/controlP5/CheckBox.java b/src/main/java/controlP5/CheckBox.java similarity index 100% rename from src/controlP5/CheckBox.java rename to src/main/java/controlP5/CheckBox.java diff --git a/src/controlP5/ColorPalette.java b/src/main/java/controlP5/ColorPalette.java similarity index 100% rename from src/controlP5/ColorPalette.java rename to src/main/java/controlP5/ColorPalette.java diff --git a/src/controlP5/ColorPicker.java b/src/main/java/controlP5/ColorPicker.java similarity index 100% rename from src/controlP5/ColorPicker.java rename to src/main/java/controlP5/ColorPicker.java diff --git a/src/controlP5/ColorWheel.java b/src/main/java/controlP5/ColorWheel.java similarity index 100% rename from src/controlP5/ColorWheel.java rename to src/main/java/controlP5/ColorWheel.java diff --git a/src/controlP5/ControlBehavior.java b/src/main/java/controlP5/ControlBehavior.java similarity index 100% rename from src/controlP5/ControlBehavior.java rename to src/main/java/controlP5/ControlBehavior.java diff --git a/src/controlP5/ControlBroadcaster.java b/src/main/java/controlP5/ControlBroadcaster.java similarity index 100% rename from src/controlP5/ControlBroadcaster.java rename to src/main/java/controlP5/ControlBroadcaster.java diff --git a/src/controlP5/ControlElement.java b/src/main/java/controlP5/ControlElement.java similarity index 100% rename from src/controlP5/ControlElement.java rename to src/main/java/controlP5/ControlElement.java diff --git a/src/controlP5/ControlEvent.java b/src/main/java/controlP5/ControlEvent.java similarity index 100% rename from src/controlP5/ControlEvent.java rename to src/main/java/controlP5/ControlEvent.java diff --git a/src/controlP5/ControlFont.java b/src/main/java/controlP5/ControlFont.java similarity index 100% rename from src/controlP5/ControlFont.java rename to src/main/java/controlP5/ControlFont.java diff --git a/src/controlP5/ControlGroup.java b/src/main/java/controlP5/ControlGroup.java similarity index 100% rename from src/controlP5/ControlGroup.java rename to src/main/java/controlP5/ControlGroup.java diff --git a/src/controlP5/ControlKey.java b/src/main/java/controlP5/ControlKey.java similarity index 100% rename from src/controlP5/ControlKey.java rename to src/main/java/controlP5/ControlKey.java diff --git a/src/controlP5/ControlListener.java b/src/main/java/controlP5/ControlListener.java similarity index 100% rename from src/controlP5/ControlListener.java rename to src/main/java/controlP5/ControlListener.java diff --git a/src/controlP5/ControlP5.java b/src/main/java/controlP5/ControlP5.java similarity index 100% rename from src/controlP5/ControlP5.java rename to src/main/java/controlP5/ControlP5.java diff --git a/src/controlP5/ControlP5Base.java b/src/main/java/controlP5/ControlP5Base.java similarity index 100% rename from src/controlP5/ControlP5Base.java rename to src/main/java/controlP5/ControlP5Base.java diff --git a/src/controlP5/ControlP5Constants.java b/src/main/java/controlP5/ControlP5Constants.java similarity index 100% rename from src/controlP5/ControlP5Constants.java rename to src/main/java/controlP5/ControlP5Constants.java diff --git a/src/controlP5/ControlP5Legacy.java b/src/main/java/controlP5/ControlP5Legacy.java similarity index 100% rename from src/controlP5/ControlP5Legacy.java rename to src/main/java/controlP5/ControlP5Legacy.java diff --git a/src/controlP5/ControlTimer.java b/src/main/java/controlP5/ControlTimer.java similarity index 100% rename from src/controlP5/ControlTimer.java rename to src/main/java/controlP5/ControlTimer.java diff --git a/src/controlP5/ControlWindow.java b/src/main/java/controlP5/ControlWindow.java similarity index 100% rename from src/controlP5/ControlWindow.java rename to src/main/java/controlP5/ControlWindow.java diff --git a/src/controlP5/ControlWindowCanvas.java b/src/main/java/controlP5/ControlWindowCanvas.java similarity index 100% rename from src/controlP5/ControlWindowCanvas.java rename to src/main/java/controlP5/ControlWindowCanvas.java diff --git a/src/controlP5/Controller.java b/src/main/java/controlP5/Controller.java similarity index 100% rename from src/controlP5/Controller.java rename to src/main/java/controlP5/Controller.java diff --git a/src/controlP5/ControllerAutomator.java b/src/main/java/controlP5/ControllerAutomator.java similarity index 100% rename from src/controlP5/ControllerAutomator.java rename to src/main/java/controlP5/ControllerAutomator.java diff --git a/src/controlP5/ControllerDisplay.java b/src/main/java/controlP5/ControllerDisplay.java similarity index 100% rename from src/controlP5/ControllerDisplay.java rename to src/main/java/controlP5/ControllerDisplay.java diff --git a/src/controlP5/ControllerGroup.java b/src/main/java/controlP5/ControllerGroup.java similarity index 100% rename from src/controlP5/ControllerGroup.java rename to src/main/java/controlP5/ControllerGroup.java diff --git a/src/controlP5/ControllerInterface.java b/src/main/java/controlP5/ControllerInterface.java similarity index 100% rename from src/controlP5/ControllerInterface.java rename to src/main/java/controlP5/ControllerInterface.java diff --git a/src/controlP5/ControllerLayout.java b/src/main/java/controlP5/ControllerLayout.java similarity index 100% rename from src/controlP5/ControllerLayout.java rename to src/main/java/controlP5/ControllerLayout.java diff --git a/src/controlP5/ControllerLayoutElement.java b/src/main/java/controlP5/ControllerLayoutElement.java similarity index 100% rename from src/controlP5/ControllerLayoutElement.java rename to src/main/java/controlP5/ControllerLayoutElement.java diff --git a/src/controlP5/ControllerList.java b/src/main/java/controlP5/ControllerList.java similarity index 100% rename from src/controlP5/ControllerList.java rename to src/main/java/controlP5/ControllerList.java diff --git a/src/controlP5/ControllerPlug.java b/src/main/java/controlP5/ControllerPlug.java similarity index 100% rename from src/controlP5/ControllerPlug.java rename to src/main/java/controlP5/ControllerPlug.java diff --git a/src/controlP5/ControllerProperties.java b/src/main/java/controlP5/ControllerProperties.java similarity index 100% rename from src/controlP5/ControllerProperties.java rename to src/main/java/controlP5/ControllerProperties.java diff --git a/src/controlP5/ControllerProperty.java b/src/main/java/controlP5/ControllerProperty.java similarity index 100% rename from src/controlP5/ControllerProperty.java rename to src/main/java/controlP5/ControllerProperty.java diff --git a/src/controlP5/ControllerStyle.java b/src/main/java/controlP5/ControllerStyle.java similarity index 100% rename from src/controlP5/ControllerStyle.java rename to src/main/java/controlP5/ControllerStyle.java diff --git a/src/controlP5/ControllerView.java b/src/main/java/controlP5/ControllerView.java similarity index 100% rename from src/controlP5/ControllerView.java rename to src/main/java/controlP5/ControllerView.java diff --git a/src/controlP5/DropdownList.java b/src/main/java/controlP5/DropdownList.java similarity index 100% rename from src/controlP5/DropdownList.java rename to src/main/java/controlP5/DropdownList.java diff --git a/src/controlP5/FieldChangedListener.java b/src/main/java/controlP5/FieldChangedListener.java similarity index 100% rename from src/controlP5/FieldChangedListener.java rename to src/main/java/controlP5/FieldChangedListener.java diff --git a/src/controlP5/FrameRate.java b/src/main/java/controlP5/FrameRate.java similarity index 100% rename from src/controlP5/FrameRate.java rename to src/main/java/controlP5/FrameRate.java diff --git a/src/controlP5/Group.java b/src/main/java/controlP5/Group.java similarity index 100% rename from src/controlP5/Group.java rename to src/main/java/controlP5/Group.java diff --git a/src/controlP5/Icon.java b/src/main/java/controlP5/Icon.java similarity index 100% rename from src/controlP5/Icon.java rename to src/main/java/controlP5/Icon.java diff --git a/src/controlP5/Knob.java b/src/main/java/controlP5/Knob.java similarity index 100% rename from src/controlP5/Knob.java rename to src/main/java/controlP5/Knob.java diff --git a/src/controlP5/Label.java b/src/main/java/controlP5/Label.java similarity index 100% rename from src/controlP5/Label.java rename to src/main/java/controlP5/Label.java diff --git a/src/controlP5/ListBox.java b/src/main/java/controlP5/ListBox.java similarity index 100% rename from src/controlP5/ListBox.java rename to src/main/java/controlP5/ListBox.java diff --git a/src/controlP5/Matrix.java b/src/main/java/controlP5/Matrix.java similarity index 100% rename from src/controlP5/Matrix.java rename to src/main/java/controlP5/Matrix.java diff --git a/src/controlP5/MultiList.java b/src/main/java/controlP5/MultiList.java similarity index 100% rename from src/controlP5/MultiList.java rename to src/main/java/controlP5/MultiList.java diff --git a/src/controlP5/MultiListButton.java b/src/main/java/controlP5/MultiListButton.java similarity index 100% rename from src/controlP5/MultiListButton.java rename to src/main/java/controlP5/MultiListButton.java diff --git a/src/controlP5/MultiListInterface.java b/src/main/java/controlP5/MultiListInterface.java similarity index 100% rename from src/controlP5/MultiListInterface.java rename to src/main/java/controlP5/MultiListInterface.java diff --git a/src/controlP5/Numberbox.java b/src/main/java/controlP5/Numberbox.java similarity index 100% rename from src/controlP5/Numberbox.java rename to src/main/java/controlP5/Numberbox.java diff --git a/src/controlP5/Pad.java b/src/main/java/controlP5/Pad.java similarity index 100% rename from src/controlP5/Pad.java rename to src/main/java/controlP5/Pad.java diff --git a/src/controlP5/Pointer.java b/src/main/java/controlP5/Pointer.java similarity index 100% rename from src/controlP5/Pointer.java rename to src/main/java/controlP5/Pointer.java diff --git a/src/controlP5/Println.java b/src/main/java/controlP5/Println.java similarity index 100% rename from src/controlP5/Println.java rename to src/main/java/controlP5/Println.java diff --git a/src/controlP5/Radio.java b/src/main/java/controlP5/Radio.java similarity index 100% rename from src/controlP5/Radio.java rename to src/main/java/controlP5/Radio.java diff --git a/src/controlP5/RadioButton.java b/src/main/java/controlP5/RadioButton.java similarity index 100% rename from src/controlP5/RadioButton.java rename to src/main/java/controlP5/RadioButton.java diff --git a/src/controlP5/Range.java b/src/main/java/controlP5/Range.java similarity index 100% rename from src/controlP5/Range.java rename to src/main/java/controlP5/Range.java diff --git a/src/controlP5/ScrollableList.java b/src/main/java/controlP5/ScrollableList.java similarity index 100% rename from src/controlP5/ScrollableList.java rename to src/main/java/controlP5/ScrollableList.java diff --git a/src/controlP5/Slider.java b/src/main/java/controlP5/Slider.java similarity index 100% rename from src/controlP5/Slider.java rename to src/main/java/controlP5/Slider.java diff --git a/src/controlP5/Slider2D.java b/src/main/java/controlP5/Slider2D.java similarity index 100% rename from src/controlP5/Slider2D.java rename to src/main/java/controlP5/Slider2D.java diff --git a/src/controlP5/Spacer.java b/src/main/java/controlP5/Spacer.java similarity index 100% rename from src/controlP5/Spacer.java rename to src/main/java/controlP5/Spacer.java diff --git a/src/controlP5/TODO b/src/main/java/controlP5/TODO similarity index 100% rename from src/controlP5/TODO rename to src/main/java/controlP5/TODO diff --git a/src/controlP5/Tab.java b/src/main/java/controlP5/Tab.java similarity index 100% rename from src/controlP5/Tab.java rename to src/main/java/controlP5/Tab.java diff --git a/src/controlP5/Textarea.java b/src/main/java/controlP5/Textarea.java similarity index 100% rename from src/controlP5/Textarea.java rename to src/main/java/controlP5/Textarea.java diff --git a/src/controlP5/Textfield.java b/src/main/java/controlP5/Textfield.java similarity index 100% rename from src/controlP5/Textfield.java rename to src/main/java/controlP5/Textfield.java diff --git a/src/controlP5/TextfieldMultiline.java b/src/main/java/controlP5/TextfieldMultiline.java similarity index 100% rename from src/controlP5/TextfieldMultiline.java rename to src/main/java/controlP5/TextfieldMultiline.java diff --git a/src/controlP5/Textlabel.java b/src/main/java/controlP5/Textlabel.java similarity index 100% rename from src/controlP5/Textlabel.java rename to src/main/java/controlP5/Textlabel.java diff --git a/src/controlP5/TickMark.java b/src/main/java/controlP5/TickMark.java similarity index 100% rename from src/controlP5/TickMark.java rename to src/main/java/controlP5/TickMark.java diff --git a/src/controlP5/Toggle.java b/src/main/java/controlP5/Toggle.java similarity index 100% rename from src/controlP5/Toggle.java rename to src/main/java/controlP5/Toggle.java diff --git a/src/controlP5/Tooltip.java b/src/main/java/controlP5/Tooltip.java similarity index 100% rename from src/controlP5/Tooltip.java rename to src/main/java/controlP5/Tooltip.java diff --git a/src/controlP5/changeLog.txt b/src/main/java/controlP5/changeLog.txt similarity index 100% rename from src/controlP5/changeLog.txt rename to src/main/java/controlP5/changeLog.txt diff --git a/src/controlP5/package.html b/src/main/java/controlP5/package.html similarity index 100% rename from src/controlP5/package.html rename to src/main/java/controlP5/package.html diff --git a/src/main/java/sketch/Sketch.java b/src/main/java/sketch/Sketch.java new file mode 100644 index 0000000..9571c3a --- /dev/null +++ b/src/main/java/sketch/Sketch.java @@ -0,0 +1,48 @@ +package sketch; + +import controlP5.ControlEvent; +import controlP5.ControlP5; +import controlP5.RadioButton; +import controlP5.TextfieldMultiline; +import processing.core.PApplet; + +public class Sketch extends PApplet { + + static public void main (String[] args){ + + PApplet.main("sketch.Sketch"); + } + + ControlP5 cp5; + public void settings(){ + size(500,500); + } + public void setup(){ + cp5 = new ControlP5(this); + + RadioButton b = new RadioButton(cp5,"radioButton") + .setPosition(100,100) + .setSize(40,20) + .setColorForeground(color(120)) + .setColorActive(color(255)) + .setColorLabel(color(255)) + .setItemsPerRow(3) + .setSpacingColumn(50) + .addItem("foo",1) + .addItem("bar",2) + .addItem("baz",3) + .activate(0) + ; + + b.plugTo(this,"radioButton"); + + + } + + public void radioButton(int index) { + + } + public void draw(){ + + } +} diff --git a/src/sketch/Sketch.java b/src/sketch/Sketch.java deleted file mode 100644 index ee7e42c..0000000 --- a/src/sketch/Sketch.java +++ /dev/null @@ -1,33 +0,0 @@ -package sketch; - -import controlP5.ControlP5; -import controlP5.TextfieldMultiline; -import processing.core.PApplet; - -public class Sketch extends PApplet { - - static public void main (String[] args){ - - PApplet.main("sketch.Sketch"); - } - - ControlP5 cp5; - public void settings(){ - size(500,500); - } - public void setup(){ - cp5 = new ControlP5(this); - TextfieldMultiline commandTextfield = new TextfieldMultiline(cp5, "commandTextfield"); - commandTextfield.setPosition(0, 0) - .setSize(200, 50) - // .setFont(mainFont) - .setColor(color(255)) - .setColorForeground(color(255, 100)) - .setText(""); - - //cp5.addToggle(commandTextfield,"commandTextfield"); - } - public void draw(){ - - } -}