propane 3.10.0-java → 3.11.0-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.mvn/wrapper/maven-wrapper.properties +1 -1
- data/CHANGELOG.md +2 -0
- data/README.md +7 -7
- data/lib/propane/app.rb +2 -5
- data/lib/propane/helper_methods.rb +6 -6
- data/lib/propane/version.rb +1 -1
- data/lib/{propane-3.10.0.jar → propane-3.11.0.jar} +0 -0
- data/pom.rb +6 -6
- data/pom.xml +6 -6
- data/propane.gemspec +3 -3
- data/src/main/java/monkstone/noise/OpenSimplex2F.java +838 -737
- data/src/main/java/monkstone/vecmath/vec2/Vec2.java +8 -13
- data/src/main/java/monkstone/vecmath/vec3/Vec3.java +14 -28
- data/src/main/java/processing/awt/PImageAWT.java +6 -4
- data/src/main/java/processing/core/PApplet.java +71 -59
- data/src/main/java/processing/core/PImage.java +14 -14
- data/src/main/java/processing/opengl/PGraphicsOpenGL.java +13 -13
- data/src/main/java/processing/opengl/PShader.java +1 -6
- data/src/main/java/processing/opengl/PSurfaceJOGL.java +6 -6
- data/{lib/java/processing/opengl → src/main/resources}/cursors/arrow.png +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/cursors/cross.png +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/cursors/hand.png +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/cursors/license.txt +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/cursors/move.png +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/cursors/text.png +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/cursors/wait.png +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/ColorFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/ColorVert.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/LightFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/LightVert.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/LineFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/LineVert.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/MaskFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/PointFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/PointVert.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/TexFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/TexLightFrag.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/TexLightVert.glsl +0 -0
- data/{lib/java/processing/opengl → src/main/resources}/shaders/TexVert.glsl +0 -0
- data/test/test_helper.rb +1 -0
- data/vendors/Rakefile +1 -1
- metadata +29 -155
- data/lib/java/japplemenubar/JAppleMenuBar.java +0 -88
- data/lib/java/japplemenubar/libjAppleMenuBar.jnilib +0 -0
- data/lib/java/monkstone/ColorUtil.java +0 -127
- data/lib/java/monkstone/MathToolModule.java +0 -287
- data/lib/java/monkstone/PropaneLibrary.java +0 -46
- data/lib/java/monkstone/core/LibraryProxy.java +0 -136
- data/lib/java/monkstone/fastmath/DegLutTables.java +0 -111
- data/lib/java/monkstone/fastmath/Deglut.java +0 -71
- data/lib/java/monkstone/fastmath/package-info.java +0 -6
- data/lib/java/monkstone/filechooser/Chooser.java +0 -39
- data/lib/java/monkstone/noise/FastTerrain.java +0 -874
- data/lib/java/monkstone/noise/Noise.java +0 -90
- data/lib/java/monkstone/noise/NoiseGenerator.java +0 -75
- data/lib/java/monkstone/noise/NoiseMode.java +0 -28
- data/lib/java/monkstone/noise/OpenSimplex2F.java +0 -881
- data/lib/java/monkstone/noise/OpenSimplex2S.java +0 -1106
- data/lib/java/monkstone/noise/SmoothTerrain.java +0 -1099
- data/lib/java/monkstone/slider/CustomHorizontalSlider.java +0 -164
- data/lib/java/monkstone/slider/CustomVerticalSlider.java +0 -178
- data/lib/java/monkstone/slider/SimpleHorizontalSlider.java +0 -145
- data/lib/java/monkstone/slider/SimpleSlider.java +0 -166
- data/lib/java/monkstone/slider/SimpleVerticalSlider.java +0 -157
- data/lib/java/monkstone/slider/Slider.java +0 -61
- data/lib/java/monkstone/slider/SliderBar.java +0 -245
- data/lib/java/monkstone/slider/SliderGroup.java +0 -56
- data/lib/java/monkstone/slider/WheelHandler.java +0 -35
- data/lib/java/monkstone/vecmath/GfxRender.java +0 -86
- data/lib/java/monkstone/vecmath/JRender.java +0 -56
- data/lib/java/monkstone/vecmath/ShapeRender.java +0 -87
- data/lib/java/monkstone/vecmath/package-info.java +0 -20
- data/lib/java/monkstone/vecmath/vec2/Vec2.java +0 -802
- data/lib/java/monkstone/vecmath/vec2/package-info.java +0 -6
- data/lib/java/monkstone/vecmath/vec3/Vec3.java +0 -727
- data/lib/java/monkstone/vecmath/vec3/package-info.java +0 -6
- data/lib/java/monkstone/videoevent/CaptureEvent.java +0 -27
- data/lib/java/monkstone/videoevent/MovieEvent.java +0 -32
- data/lib/java/monkstone/videoevent/package-info.java +0 -20
- data/lib/java/processing/awt/PGraphicsJava2D.java +0 -3040
- data/lib/java/processing/awt/PImageAWT.java +0 -377
- data/lib/java/processing/awt/PShapeJava2D.java +0 -387
- data/lib/java/processing/awt/PSurfaceAWT.java +0 -1581
- data/lib/java/processing/awt/ShimAWT.java +0 -581
- data/lib/java/processing/core/PApplet.java +0 -15156
- data/lib/java/processing/core/PConstants.java +0 -523
- data/lib/java/processing/core/PFont.java +0 -1126
- data/lib/java/processing/core/PGraphics.java +0 -8600
- data/lib/java/processing/core/PImage.java +0 -3377
- data/lib/java/processing/core/PMatrix.java +0 -208
- data/lib/java/processing/core/PMatrix2D.java +0 -562
- data/lib/java/processing/core/PMatrix3D.java +0 -890
- data/lib/java/processing/core/PShape.java +0 -3561
- data/lib/java/processing/core/PShapeOBJ.java +0 -483
- data/lib/java/processing/core/PShapeSVG.java +0 -2016
- data/lib/java/processing/core/PStyle.java +0 -63
- data/lib/java/processing/core/PSurface.java +0 -198
- data/lib/java/processing/core/PSurfaceNone.java +0 -431
- data/lib/java/processing/core/PVector.java +0 -1066
- data/lib/java/processing/core/ThinkDifferent.java +0 -115
- data/lib/java/processing/data/DoubleDict.java +0 -850
- data/lib/java/processing/data/DoubleList.java +0 -928
- data/lib/java/processing/data/FloatDict.java +0 -847
- data/lib/java/processing/data/FloatList.java +0 -936
- data/lib/java/processing/data/IntDict.java +0 -807
- data/lib/java/processing/data/IntList.java +0 -936
- data/lib/java/processing/data/JSONArray.java +0 -1260
- data/lib/java/processing/data/JSONObject.java +0 -2282
- data/lib/java/processing/data/JSONTokener.java +0 -435
- data/lib/java/processing/data/LongDict.java +0 -802
- data/lib/java/processing/data/LongList.java +0 -937
- data/lib/java/processing/data/Sort.java +0 -46
- data/lib/java/processing/data/StringDict.java +0 -613
- data/lib/java/processing/data/StringList.java +0 -800
- data/lib/java/processing/data/Table.java +0 -4936
- data/lib/java/processing/data/TableRow.java +0 -198
- data/lib/java/processing/data/XML.java +0 -1156
- data/lib/java/processing/dxf/RawDXF.java +0 -404
- data/lib/java/processing/event/Event.java +0 -125
- data/lib/java/processing/event/KeyEvent.java +0 -70
- data/lib/java/processing/event/MouseEvent.java +0 -114
- data/lib/java/processing/event/TouchEvent.java +0 -57
- data/lib/java/processing/javafx/PGraphicsFX2D.java +0 -32
- data/lib/java/processing/javafx/PSurfaceFX.java +0 -173
- data/lib/java/processing/net/Client.java +0 -744
- data/lib/java/processing/net/Server.java +0 -388
- data/lib/java/processing/opengl/FontTexture.java +0 -378
- data/lib/java/processing/opengl/FrameBuffer.java +0 -513
- data/lib/java/processing/opengl/LinePath.java +0 -627
- data/lib/java/processing/opengl/LineStroker.java +0 -681
- data/lib/java/processing/opengl/PGL.java +0 -3483
- data/lib/java/processing/opengl/PGraphics2D.java +0 -615
- data/lib/java/processing/opengl/PGraphics3D.java +0 -281
- data/lib/java/processing/opengl/PGraphicsOpenGL.java +0 -13753
- data/lib/java/processing/opengl/PJOGL.java +0 -2008
- data/lib/java/processing/opengl/PShader.java +0 -1484
- data/lib/java/processing/opengl/PShapeOpenGL.java +0 -5269
- data/lib/java/processing/opengl/PSurfaceJOGL.java +0 -1385
- data/lib/java/processing/opengl/Texture.java +0 -1696
- data/lib/java/processing/opengl/VertexBuffer.java +0 -88
- data/lib/java/processing/pdf/PGraphicsPDF.java +0 -581
- data/lib/java/processing/svg/PGraphicsSVG.java +0 -378
- data/src/main/java/processing/opengl/cursors/arrow.png +0 -0
- data/src/main/java/processing/opengl/cursors/cross.png +0 -0
- data/src/main/java/processing/opengl/cursors/hand.png +0 -0
- data/src/main/java/processing/opengl/cursors/license.txt +0 -27
- data/src/main/java/processing/opengl/cursors/move.png +0 -0
- data/src/main/java/processing/opengl/cursors/text.png +0 -0
- data/src/main/java/processing/opengl/cursors/wait.png +0 -0
- data/src/main/java/processing/opengl/shaders/ColorFrag.glsl +0 -32
- data/src/main/java/processing/opengl/shaders/ColorVert.glsl +0 -34
- data/src/main/java/processing/opengl/shaders/LightFrag.glsl +0 -33
- data/src/main/java/processing/opengl/shaders/LightVert.glsl +0 -151
- data/src/main/java/processing/opengl/shaders/LineFrag.glsl +0 -32
- data/src/main/java/processing/opengl/shaders/LineVert.glsl +0 -100
- data/src/main/java/processing/opengl/shaders/MaskFrag.glsl +0 -40
- data/src/main/java/processing/opengl/shaders/PointFrag.glsl +0 -32
- data/src/main/java/processing/opengl/shaders/PointVert.glsl +0 -56
- data/src/main/java/processing/opengl/shaders/TexFrag.glsl +0 -37
- data/src/main/java/processing/opengl/shaders/TexLightFrag.glsl +0 -37
- data/src/main/java/processing/opengl/shaders/TexLightVert.glsl +0 -157
- data/src/main/java/processing/opengl/shaders/TexVert.glsl +0 -38
@@ -1,164 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2015-20 Martin Prout
|
3
|
-
*
|
4
|
-
* This library is free software; you can redistribute it and/or
|
5
|
-
* modify it under the terms of the GNU Lesser General Public
|
6
|
-
* License as published by the Free Software Foundation; either
|
7
|
-
* version 2.1 of the License, or (at your option) any later version.
|
8
|
-
*
|
9
|
-
* http://creativecommons.org/licenses/LGPL/2.1/
|
10
|
-
*
|
11
|
-
* This library is distributed in the hope that it will be useful,
|
12
|
-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
14
|
-
* Lesser General Public License for more details.
|
15
|
-
*
|
16
|
-
* You should have received a copy of the GNU Lesser General Public
|
17
|
-
* License along with this library; if not, write to the Free Software
|
18
|
-
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
19
|
-
*/
|
20
|
-
package monkstone.slider;
|
21
|
-
|
22
|
-
import processing.core.PApplet;
|
23
|
-
import processing.core.PConstants;
|
24
|
-
|
25
|
-
public class CustomHorizontalSlider extends SliderBar {
|
26
|
-
|
27
|
-
/**
|
28
|
-
*
|
29
|
-
* @param outer
|
30
|
-
* @param x top left position x
|
31
|
-
* @param y left top position y
|
32
|
-
* @param length width or height
|
33
|
-
* @param beginRange start range
|
34
|
-
* @param endRange end range
|
35
|
-
* @param label widget label/ID
|
36
|
-
*/
|
37
|
-
public CustomHorizontalSlider(final PApplet outer, int x, int y, int length, float beginRange, float endRange, String label) {
|
38
|
-
this.applet = outer;
|
39
|
-
this.scrollWheelHandler = (short delta) -> {
|
40
|
-
changeWithWheel(delta);
|
41
|
-
};
|
42
|
-
setActive(true);
|
43
|
-
pX = x;
|
44
|
-
pY = y;
|
45
|
-
pW = length;
|
46
|
-
pH = 10;
|
47
|
-
ID = label;
|
48
|
-
limits(beginRange, endRange);
|
49
|
-
}
|
50
|
-
|
51
|
-
@Override
|
52
|
-
boolean mouseOver() {
|
53
|
-
return (applet.mouseX >= pX && applet.mouseX <= pX + pW && applet.mouseY >= pY && applet.mouseY <= pY + pH);
|
54
|
-
}
|
55
|
-
|
56
|
-
private void setActive(boolean active) {
|
57
|
-
if (active) {
|
58
|
-
applet.registerMethod("dispose", this);
|
59
|
-
applet.registerMethod("draw", this);
|
60
|
-
applet.registerMethod("mouseEvent", this);
|
61
|
-
} else {
|
62
|
-
applet.unregisterMethod("draw", this);
|
63
|
-
applet.unregisterMethod("mouseEvent", this);
|
64
|
-
}
|
65
|
-
}
|
66
|
-
|
67
|
-
@Override
|
68
|
-
void displayText() {
|
69
|
-
String lFormat = "%d";
|
70
|
-
if (displayLabel) {
|
71
|
-
applet.fill(labelColor);
|
72
|
-
applet.textSize(labelSize);
|
73
|
-
applet.textAlign(PConstants.CENTER);
|
74
|
-
applet.text(Integer.toString((int) pValue), pX + pW / 2, pY + pH / 2 + labelSize / 2 - 2);
|
75
|
-
}
|
76
|
-
if (displayValue) {
|
77
|
-
applet.textSize(numberSize);
|
78
|
-
applet.fill(numbersColor);
|
79
|
-
applet.textAlign(PConstants.LEFT);
|
80
|
-
applet.text(String.format(lFormat, (int) vMin), pX, pY - numberSize / 2);
|
81
|
-
applet.textAlign(PConstants.RIGHT);
|
82
|
-
applet.text(String.format(lFormat, (int) vMax), pX + pW, pY - numberSize / 2);
|
83
|
-
}
|
84
|
-
}
|
85
|
-
|
86
|
-
@Override
|
87
|
-
void drawGui() {
|
88
|
-
if (backgroundVisible) {
|
89
|
-
applet.fill(sliderBack);
|
90
|
-
applet.rect(pX, pY, pW, pH);
|
91
|
-
}
|
92
|
-
applet.fill(sliderFill);
|
93
|
-
applet.rect(pX, pY, pScaled, pH);
|
94
|
-
}
|
95
|
-
|
96
|
-
/**
|
97
|
-
*
|
98
|
-
* @param value
|
99
|
-
*/
|
100
|
-
@Override
|
101
|
-
public void setValue(float value) {
|
102
|
-
if (value > vMax) {
|
103
|
-
value = vMax;
|
104
|
-
}
|
105
|
-
if (value < vMin) {
|
106
|
-
value = vMin;
|
107
|
-
}
|
108
|
-
pValue = value;
|
109
|
-
pScaled = map(pValue, vMin, vMax, 0, pW);
|
110
|
-
}
|
111
|
-
|
112
|
-
@Override
|
113
|
-
void checkKeyboard() {
|
114
|
-
if (mouseOver()) {
|
115
|
-
if (applet.mousePressed && applet.mouseButton == PConstants.LEFT) {
|
116
|
-
pValue = constrainMap(applet.mouseX - pX, 0, pW, vMin, vMax);
|
117
|
-
}
|
118
|
-
if (applet.keyPressed && pressOnlyOnce) {
|
119
|
-
if (applet.keyCode == PConstants.LEFT || applet.keyCode == PConstants.DOWN) {
|
120
|
-
pValue--;
|
121
|
-
}
|
122
|
-
if (applet.keyCode == PConstants.RIGHT || applet.keyCode == PConstants.UP) {
|
123
|
-
pValue++;
|
124
|
-
}
|
125
|
-
if (pValue > vMax) {
|
126
|
-
pValue = vMax;
|
127
|
-
} else {
|
128
|
-
pValue = (pValue < vMin) ? vMin : pValue;
|
129
|
-
}
|
130
|
-
pressOnlyOnce = false;
|
131
|
-
}
|
132
|
-
deBounce(5);
|
133
|
-
pScaled = map(pValue, vMin, vMax, 0, pW);
|
134
|
-
}
|
135
|
-
}
|
136
|
-
|
137
|
-
/**
|
138
|
-
*
|
139
|
-
* @param delta
|
140
|
-
*/
|
141
|
-
@Override
|
142
|
-
public void changeWithWheel(int delta) {
|
143
|
-
if (!mouseOver()) {
|
144
|
-
return;
|
145
|
-
}
|
146
|
-
if (applet.keyPressed && applet.keyCode == PConstants.SHIFT) {
|
147
|
-
delta = delta * (int) (vMax / 10);
|
148
|
-
}
|
149
|
-
if (applet.keyPressed && applet.keyCode == PConstants.CONTROL) {
|
150
|
-
delta = delta * (int) (vMax / 4);
|
151
|
-
}
|
152
|
-
setValue(pValue + delta);
|
153
|
-
}
|
154
|
-
|
155
|
-
/**
|
156
|
-
*
|
157
|
-
* @return
|
158
|
-
*/
|
159
|
-
@Override
|
160
|
-
public String toString() {
|
161
|
-
String geomF = "HorizontalSliderBar.new(%d, %d, %d, %.2f, %.2f, \"%s\")";
|
162
|
-
return String.format(geomF, pX, pY, pW, vMin, vMax, ID);
|
163
|
-
}
|
164
|
-
}
|
@@ -1,178 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2015-20 Martin Prout
|
3
|
-
*
|
4
|
-
* This library is free software; you can redistribute it and/or
|
5
|
-
* modify it under the terms of the GNU Lesser General Public
|
6
|
-
* License as published by the Free Software Foundation; either
|
7
|
-
* version 2.1 of the License, or (at your option) any later version.
|
8
|
-
*
|
9
|
-
* http://creativecommons.org/licenses/LGPL/2.1/
|
10
|
-
*
|
11
|
-
* This library is distributed in the hope that it will be useful,
|
12
|
-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
14
|
-
* Lesser General Public License for more details.
|
15
|
-
*
|
16
|
-
* You should have received a copy of the GNU Lesser General Public
|
17
|
-
* License along with this library; if not, write to the Free Software
|
18
|
-
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
19
|
-
*/
|
20
|
-
package monkstone.slider;
|
21
|
-
|
22
|
-
import processing.core.PApplet;
|
23
|
-
import processing.core.PConstants;
|
24
|
-
import static processing.core.PConstants.*;
|
25
|
-
|
26
|
-
public class CustomVerticalSlider extends SliderBar {
|
27
|
-
|
28
|
-
/**
|
29
|
-
*
|
30
|
-
* @param outer
|
31
|
-
* @param x top left position x
|
32
|
-
* @param y left top position y
|
33
|
-
* @param length width or height
|
34
|
-
* @param beginRange start range
|
35
|
-
* @param endRange end range
|
36
|
-
* @param label widget label/ID
|
37
|
-
*/
|
38
|
-
public CustomVerticalSlider(final PApplet outer, int x, int y, int length, float beginRange, float endRange, String label) {
|
39
|
-
this.applet = outer;
|
40
|
-
this.scrollWheelHandler = (short delta) -> {
|
41
|
-
changeWithWheel(delta);
|
42
|
-
};
|
43
|
-
setActive(true);
|
44
|
-
pX = x;
|
45
|
-
pY = y;
|
46
|
-
pW = length;
|
47
|
-
pH = 10;
|
48
|
-
ID = label;
|
49
|
-
limits(beginRange, endRange);
|
50
|
-
}
|
51
|
-
|
52
|
-
@Override
|
53
|
-
boolean mouseOver() {
|
54
|
-
return (applet.mouseX >= pX && applet.mouseX <= pX + pH && applet.mouseY >= pY && applet.mouseY <= pY + pW);
|
55
|
-
}
|
56
|
-
|
57
|
-
private void setActive(boolean active) {
|
58
|
-
if (active) {
|
59
|
-
applet.registerMethod("dispose", this);
|
60
|
-
applet.registerMethod("draw", this);
|
61
|
-
applet.registerMethod("mouseEvent", this);
|
62
|
-
} else {
|
63
|
-
applet.unregisterMethod("draw", this);
|
64
|
-
applet.unregisterMethod("mouseEvent", this);
|
65
|
-
}
|
66
|
-
}
|
67
|
-
|
68
|
-
@Override
|
69
|
-
void displayText() {
|
70
|
-
String lFormat = "%d";
|
71
|
-
if (displayLabel) {
|
72
|
-
applet.fill(labelColor);
|
73
|
-
applet.textSize(labelSize);
|
74
|
-
applet.textAlign(PConstants.CENTER);
|
75
|
-
applet.pushMatrix();
|
76
|
-
applet.translate(pX + pH / 2, pY + pW / 2);
|
77
|
-
applet.rotate(HALF_PI);
|
78
|
-
applet.text(Integer.toString((int) pValue), 0, 0 + labelSize / 2 - 2);
|
79
|
-
applet.popMatrix();
|
80
|
-
}
|
81
|
-
if (displayValue) {
|
82
|
-
applet.textSize(numberSize);
|
83
|
-
applet.fill(numbersColor);
|
84
|
-
applet.pushMatrix();
|
85
|
-
applet.textAlign(PConstants.RIGHT);
|
86
|
-
applet.translate(pX - numberSize / 2, pY);
|
87
|
-
applet.rotate(HALF_PI);
|
88
|
-
applet.text(String.format(lFormat, (int) vMax), 0, 0);
|
89
|
-
applet.popMatrix();
|
90
|
-
applet.pushMatrix();
|
91
|
-
applet.textAlign(PConstants.LEFT);
|
92
|
-
applet.translate(pX - numberSize / 2, pY + pW);
|
93
|
-
applet.rotate(HALF_PI);
|
94
|
-
applet.text(String.format(lFormat, (int) vMin), 0, 0);
|
95
|
-
applet.popMatrix();
|
96
|
-
}
|
97
|
-
}
|
98
|
-
|
99
|
-
@Override
|
100
|
-
void drawGui() {
|
101
|
-
if (backgroundVisible) {
|
102
|
-
applet.fill(sliderBack);
|
103
|
-
applet.rect(pX, pY, pH, pW);
|
104
|
-
}
|
105
|
-
applet.fill(sliderFill);
|
106
|
-
applet.rect(pX, pY + pW, pH, pScaled - pW);
|
107
|
-
}
|
108
|
-
|
109
|
-
/**
|
110
|
-
*
|
111
|
-
* @param value
|
112
|
-
*/
|
113
|
-
@Override
|
114
|
-
public void setValue(float value) {
|
115
|
-
if (value > vMax) {
|
116
|
-
value = vMax;
|
117
|
-
}
|
118
|
-
if (value < vMin) {
|
119
|
-
value = vMin;
|
120
|
-
}
|
121
|
-
pValue = value;
|
122
|
-
pScaled = map(pValue, vMin, vMax, pW, 0);
|
123
|
-
}
|
124
|
-
|
125
|
-
@Override
|
126
|
-
void checkKeyboard() {
|
127
|
-
if (mouseOver()) {
|
128
|
-
if (applet.mousePressed && applet.mouseButton == PConstants.LEFT) {
|
129
|
-
pValue = constrainMap(applet.mouseY - pY, pW, 0, vMin, vMax);
|
130
|
-
}
|
131
|
-
if (applet.keyPressed && pressOnlyOnce) {
|
132
|
-
if (applet.keyCode == PConstants.LEFT || applet.keyCode == PConstants.DOWN) {
|
133
|
-
pValue--;
|
134
|
-
}
|
135
|
-
if (applet.keyCode == PConstants.RIGHT || applet.keyCode == PConstants.UP) {
|
136
|
-
pValue++;
|
137
|
-
}
|
138
|
-
if (pValue > vMax) {
|
139
|
-
pValue = vMax;
|
140
|
-
} else {
|
141
|
-
pValue = (pValue < vMin) ? vMin : pValue;
|
142
|
-
}
|
143
|
-
pressOnlyOnce = false;
|
144
|
-
}
|
145
|
-
deBounce(5);
|
146
|
-
pScaled = map(pValue, vMin, vMax, pW, 0);
|
147
|
-
}
|
148
|
-
}
|
149
|
-
|
150
|
-
/**
|
151
|
-
*
|
152
|
-
* @param delta
|
153
|
-
*/
|
154
|
-
@Override
|
155
|
-
public void changeWithWheel(int delta) {
|
156
|
-
if (!mouseOver()) {
|
157
|
-
return;
|
158
|
-
}
|
159
|
-
if (applet.keyPressed && applet.keyCode == PConstants.SHIFT) {
|
160
|
-
delta = delta * (int) (vMax / 10);
|
161
|
-
}
|
162
|
-
if (applet.keyPressed && applet.keyCode == PConstants.CONTROL) {
|
163
|
-
delta = delta * (int) (vMax / 4);
|
164
|
-
}
|
165
|
-
setValue(pValue - delta);
|
166
|
-
}
|
167
|
-
|
168
|
-
/**
|
169
|
-
*
|
170
|
-
* @return
|
171
|
-
*/
|
172
|
-
@Override
|
173
|
-
public String toString() {
|
174
|
-
String geomF = "VerticalSliderBar.new(%d, %d, %d, %.2f, %.2f, \"%s\")";
|
175
|
-
return String.format(geomF, pX, pY, pW, vMin, vMax, ID);
|
176
|
-
}
|
177
|
-
|
178
|
-
}
|
@@ -1,145 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* Copyright (c) 2015-20 Martin Prout
|
3
|
-
*
|
4
|
-
* This library is free software; you can redistribute it and/or
|
5
|
-
* modify it under the terms of the GNU Lesser General Public
|
6
|
-
* License as published by the Free Software Foundation; either
|
7
|
-
* version 2.1 of the License, or (at your option) any later version.
|
8
|
-
*
|
9
|
-
* http://creativecommons.org/licenses/LGPL/2.1/
|
10
|
-
*
|
11
|
-
* This library is distributed in the hope that it will be useful,
|
12
|
-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
13
|
-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
14
|
-
* Lesser General Public License for more details.
|
15
|
-
*
|
16
|
-
* You should have received a copy of the GNU Lesser General Public
|
17
|
-
* License along with this library; if not, write to the Free Software
|
18
|
-
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
19
|
-
*/
|
20
|
-
package monkstone.slider;
|
21
|
-
|
22
|
-
import processing.core.PApplet;
|
23
|
-
import processing.core.PConstants;
|
24
|
-
|
25
|
-
public class SimpleHorizontalSlider extends SimpleSlider {
|
26
|
-
|
27
|
-
final int SPACING = 20;
|
28
|
-
final int LEFT_SPC = SPACING * 2;
|
29
|
-
final int RIGHT_SPC = SPACING * 4;
|
30
|
-
|
31
|
-
/**
|
32
|
-
*
|
33
|
-
* @param outer
|
34
|
-
* @param beginRange start range
|
35
|
-
* @param endRange end range
|
36
|
-
* @param initial
|
37
|
-
* @param count
|
38
|
-
*/
|
39
|
-
public SimpleHorizontalSlider(final PApplet outer, float beginRange, float endRange, float initial, int count) {
|
40
|
-
this.applet = outer;
|
41
|
-
setActive(true);
|
42
|
-
pX = LEFT_SPC;
|
43
|
-
pY = outer.height - SPACING - (count * SPACING);
|
44
|
-
pW = outer.width - RIGHT_SPC;
|
45
|
-
pH = 10;
|
46
|
-
ID = Integer.toString(count + 1);
|
47
|
-
limits(beginRange, endRange);
|
48
|
-
setValue(initial);
|
49
|
-
}
|
50
|
-
|
51
|
-
@Override
|
52
|
-
boolean mouseOver() {
|
53
|
-
return (applet.mouseX >= pX && applet.mouseX <= pX + pW && applet.mouseY >= pY && applet.mouseY <= pY + pH);
|
54
|
-
}
|
55
|
-
|
56
|
-
private void setActive(boolean active) {
|
57
|
-
if (active) {
|
58
|
-
applet.registerMethod("dispose", this);
|
59
|
-
applet.registerMethod("draw", this);
|
60
|
-
} else {
|
61
|
-
applet.unregisterMethod("draw", this);
|
62
|
-
}
|
63
|
-
}
|
64
|
-
|
65
|
-
@Override
|
66
|
-
void displayText() {
|
67
|
-
String lFormat = "%d";
|
68
|
-
if (displayLabel) {
|
69
|
-
applet.fill(labelColor);
|
70
|
-
applet.textSize(labelSize);
|
71
|
-
applet.textAlign(PConstants.BOTTOM);
|
72
|
-
applet.text(Integer.toString((int) pValue), pX + pW / 2, pY + pH);
|
73
|
-
}
|
74
|
-
if (displayValue) {
|
75
|
-
applet.textSize(numberSize);
|
76
|
-
applet.fill(numbersColor);
|
77
|
-
applet.textAlign(PConstants.LEFT);
|
78
|
-
applet.text(String.format(lFormat, (int) vMin), pX, pY);
|
79
|
-
applet.textAlign(PConstants.RIGHT);
|
80
|
-
applet.text(String.format(lFormat, (int) vMax), pX + pW, pY);
|
81
|
-
}
|
82
|
-
}
|
83
|
-
|
84
|
-
@Override
|
85
|
-
void drawGui() {
|
86
|
-
if (backgroundVisible) {
|
87
|
-
applet.stroke(sliderBack);
|
88
|
-
applet.line(pX, pY + pH / 2, pX + pW, pY + pH / 2);
|
89
|
-
}
|
90
|
-
applet.noStroke();
|
91
|
-
applet.fill(255);
|
92
|
-
applet.ellipse(pX + pScaled, pY + pH / 2, 10, 10);
|
93
|
-
}
|
94
|
-
|
95
|
-
/**
|
96
|
-
*
|
97
|
-
* @param value
|
98
|
-
*/
|
99
|
-
@Override
|
100
|
-
public final void setValue(float value) {
|
101
|
-
if (value > vMax) {
|
102
|
-
value = vMax;
|
103
|
-
}
|
104
|
-
if (value < vMin) {
|
105
|
-
value = vMin;
|
106
|
-
}
|
107
|
-
pValue = value;
|
108
|
-
pScaled = map(pValue, vMin, vMax, 0, pW);
|
109
|
-
}
|
110
|
-
|
111
|
-
@Override
|
112
|
-
void checkKeyboard() {
|
113
|
-
if (mouseOver()) {
|
114
|
-
if (applet.mousePressed && applet.mouseButton == PConstants.LEFT) {
|
115
|
-
pValue = constrainMap(applet.mouseX - pX, 0, pW, vMin, vMax);
|
116
|
-
}
|
117
|
-
if (applet.keyPressed && pressOnlyOnce) {
|
118
|
-
if (applet.keyCode == PConstants.LEFT || applet.keyCode == PConstants.DOWN) {
|
119
|
-
pValue--;
|
120
|
-
}
|
121
|
-
if (applet.keyCode == PConstants.RIGHT || applet.keyCode == PConstants.UP) {
|
122
|
-
pValue++;
|
123
|
-
}
|
124
|
-
if (pValue > vMax) {
|
125
|
-
pValue = vMax;
|
126
|
-
} else {
|
127
|
-
pValue = (pValue < vMin) ? vMin : pValue;
|
128
|
-
}
|
129
|
-
pressOnlyOnce = false;
|
130
|
-
}
|
131
|
-
deBounce(5);
|
132
|
-
pScaled = map(pValue, vMin, vMax, 0, pW);
|
133
|
-
}
|
134
|
-
}
|
135
|
-
|
136
|
-
/**
|
137
|
-
*
|
138
|
-
* @return
|
139
|
-
*/
|
140
|
-
@Override
|
141
|
-
public String toString() {
|
142
|
-
String geomF = "SimpleHSliderBar.new(%d, %d, %d, %.2f, %.2f, \"%s\")";
|
143
|
-
return String.format(geomF, pX, pY, pW, vMin, vMax, ID);
|
144
|
-
}
|
145
|
-
}
|
@@ -1,166 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* To change this license header, choose License Headers in Project Properties.
|
3
|
-
* To change this template file, choose Tools | Templates
|
4
|
-
* and open the template in the editor.
|
5
|
-
*/
|
6
|
-
package monkstone.slider;
|
7
|
-
|
8
|
-
import processing.core.PApplet;
|
9
|
-
|
10
|
-
/**
|
11
|
-
*
|
12
|
-
* @author tux
|
13
|
-
*/
|
14
|
-
public abstract class SimpleSlider implements Slider {//implements Slider {
|
15
|
-
|
16
|
-
int MIN_BAR_WIDTH = 10;
|
17
|
-
int MAX_BAR_WIDTH = 30;
|
18
|
-
int sliderBack = 0xff909090;
|
19
|
-
int sliderFill = 0xff696969;
|
20
|
-
int borderColor = 0;
|
21
|
-
int numbersColor = 0;
|
22
|
-
int labelColor = 0;
|
23
|
-
int externalBorder = 0;
|
24
|
-
boolean backgroundVisible = true;
|
25
|
-
int labelSize = 18;
|
26
|
-
int numberSize = 14;
|
27
|
-
boolean displayLabel = false;
|
28
|
-
boolean displayValue = true;
|
29
|
-
int pX;
|
30
|
-
int pY;
|
31
|
-
int pW;
|
32
|
-
int pH;
|
33
|
-
float pScaled = 0;
|
34
|
-
float pValue = 0;
|
35
|
-
String ID;
|
36
|
-
boolean pressOnlyOnce = true;
|
37
|
-
int deb = 0;
|
38
|
-
short wheelCount = 0;
|
39
|
-
float vMin = 0;
|
40
|
-
float vMax = 15;
|
41
|
-
PApplet applet;
|
42
|
-
|
43
|
-
abstract void displayText();
|
44
|
-
|
45
|
-
abstract void drawGui();
|
46
|
-
|
47
|
-
@Override
|
48
|
-
public void draw() {
|
49
|
-
applet.pushStyle();
|
50
|
-
applet.noStroke();
|
51
|
-
drawGui();
|
52
|
-
displayText();
|
53
|
-
applet.popStyle();
|
54
|
-
change();
|
55
|
-
}
|
56
|
-
|
57
|
-
/**
|
58
|
-
*
|
59
|
-
*/
|
60
|
-
@Override
|
61
|
-
public void showLabel() {
|
62
|
-
displayLabel = true;
|
63
|
-
}
|
64
|
-
|
65
|
-
/**
|
66
|
-
*
|
67
|
-
*/
|
68
|
-
@Override
|
69
|
-
public void hideLabel() {
|
70
|
-
displayLabel = false;
|
71
|
-
}
|
72
|
-
|
73
|
-
/**
|
74
|
-
*
|
75
|
-
*/
|
76
|
-
@Override
|
77
|
-
public void showNumbers() {
|
78
|
-
displayValue = true;
|
79
|
-
}
|
80
|
-
|
81
|
-
/**
|
82
|
-
*
|
83
|
-
*/
|
84
|
-
@Override
|
85
|
-
public void hideNumbers() {
|
86
|
-
displayValue = false;
|
87
|
-
}
|
88
|
-
|
89
|
-
void change() {
|
90
|
-
checkKeyboard();
|
91
|
-
}
|
92
|
-
|
93
|
-
/**
|
94
|
-
*
|
95
|
-
*/
|
96
|
-
@Override
|
97
|
-
public void hideBackground() {
|
98
|
-
backgroundVisible = false;
|
99
|
-
}
|
100
|
-
|
101
|
-
/**
|
102
|
-
*
|
103
|
-
* @return
|
104
|
-
*/
|
105
|
-
@Override
|
106
|
-
public float readValue() {
|
107
|
-
return pValue;
|
108
|
-
}
|
109
|
-
|
110
|
-
abstract boolean mouseOver();
|
111
|
-
|
112
|
-
protected float map(float val, float begIn, float endIn, float beginOut, float endOut) {
|
113
|
-
return (beginOut + (endOut - beginOut) * ((val - begIn) / (endIn - begIn)));
|
114
|
-
}
|
115
|
-
|
116
|
-
final void limits(float iv, float fv) {
|
117
|
-
vMin = iv;
|
118
|
-
vMax = fv;
|
119
|
-
setValue(iv);
|
120
|
-
}
|
121
|
-
|
122
|
-
/**
|
123
|
-
*
|
124
|
-
* @param s
|
125
|
-
*/
|
126
|
-
@Override
|
127
|
-
public void labelSize(int s) {
|
128
|
-
labelSize = (s < 4) ? 4 : s;
|
129
|
-
}
|
130
|
-
|
131
|
-
void deBounce(int n) {
|
132
|
-
if (pressOnlyOnce) {
|
133
|
-
} else if (deb++ > n) {
|
134
|
-
deb = 0;
|
135
|
-
pressOnlyOnce = true;
|
136
|
-
}
|
137
|
-
}
|
138
|
-
|
139
|
-
abstract void checkKeyboard();
|
140
|
-
|
141
|
-
protected int constrainMap(double val, double begIn, double endIn, double beginOut, double endOut) {
|
142
|
-
double max = Math.max(begIn, endIn);
|
143
|
-
double min = Math.min(begIn, endIn);
|
144
|
-
if (val < min) {
|
145
|
-
val = min;
|
146
|
-
}
|
147
|
-
if (val > max) {
|
148
|
-
val = max;
|
149
|
-
}
|
150
|
-
return (int) ((beginOut + (endOut - beginOut) * ((val - begIn) / (endIn - begIn))));
|
151
|
-
}
|
152
|
-
|
153
|
-
private void setActive(boolean active) {
|
154
|
-
if (active) {
|
155
|
-
applet.registerMethod("dispose", this);
|
156
|
-
applet.registerMethod("draw", this);
|
157
|
-
} else {
|
158
|
-
applet.unregisterMethod("draw", this);
|
159
|
-
}
|
160
|
-
}
|
161
|
-
|
162
|
-
@Override
|
163
|
-
public void dispose() {
|
164
|
-
setActive(false);
|
165
|
-
}
|
166
|
-
}
|