vmario/controlp5
0
0
Fork 0
mirror of https://github.com/sojamo/controlp5 synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing hsl update and background issues

Browse Source
This commit is contained in:
andreas schlegel 2018-09-22 23:04:20 +08:00
parent a8cfe12f78
commit cc775e7e31
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/controlP5/ColorWheel.java
View File

@ -52,6 +52,7 @@ public class ColorWheel extends Controller< ColorWheel > {
private final static int ALPHA = 2; private final static int ALPHA = 2;
int _sideHandleHeight = 8; int _sideHandleHeight = 8;
private double[] hsl = new double[] { 1.0 , 1.0 , 1.0 }; private double[] hsl = new double[] { 1.0 , 1.0 , 1.0 };
private boolean isUpdateColor = false;
// argb = int ( 0-255 , 0-255 , 0-255 , 0-255 ) // argb = int ( 0-255 , 0-255 , 0-255 , 0-255 )
// hue = double ( 0.0-1.0 ) 0-360 // hue = double ( 0.0-1.0 ) 0-360
@ -76,6 +77,8 @@ public class ColorWheel extends Controller< ColorWheel > {
_myInfoLabel.setPaddingX( 4 ).getStyle( ).marginTop = 4; _myInfoLabel.setPaddingX( 4 ).getStyle( ).marginTop = 4;
yoff = ( int ) ( getWidth( ) * 0.05 ); yoff = ( int ) ( getWidth( ) * 0.05 );
getColor().setBackground(cp5.papplet.color(0,100));
setColorResources( ); setColorResources( );
} }
@ -224,21 +227,28 @@ public class ColorWheel extends Controller< ColorWheel > {
} }
public void setHue( double theH ) { public void setHue( double theH ) {
hsl[ 0 ] = Math.max( 0 , Math.min( 1 , theH ) ); hsl[ 0 ] = Math.max( 0 , Math.min( 1 , theH ) );
isUpdateColor = true;
} }
public void setSaturation( double theS ) { public void setSaturation( double theS ) {
hsl[ 1 ] = Math.max( 0 , Math.min( 1 , theS ) ); hsl[ 1 ] = Math.max( 0 , Math.min( 1 , theS ) );
isUpdateColor = true;
} }
public void setLightness( double theL ) { public void setLightness( double theL ) {
hsl[ 2 ] = Math.max( 0 , Math.min( 1 , theL ) ); hsl[ 2 ] = Math.max( 0 , Math.min( 1 , theL ) );
isUpdateColor = true;
} }
public ColorWheel setHSL( double theH , double theS , double theL ) { public ColorWheel setHSL( double theH , double theS , double theL ) {
setHue( theH ); setHue( theH );
setSaturation( theS ); setSaturation( theS );
setLightness( theL ); setLightness( theL );
isUpdateColor = true;
return this; return this;
} }
@ -260,8 +270,7 @@ public class ColorWheel extends Controller< ColorWheel > {
set( _myCursor , x , y ); set( _myCursor , x , y );
setSaturation( t[ 1 ] ); setSaturation( t[ 1 ] );
// TODO resolve rounding error issue as reported here https://github.com/sojamo/controlp5/issues/21 // TODO resolve rounding error issue as reported here https://github.com/sojamo/controlp5/issues/21
_myColorValue = HSLtoRGB( hsl ); isUpdateColor = true;
setValue( _myColorValue );
return this; return this;
} }
@ -277,6 +286,16 @@ public class ColorWheel extends Controller< ColorWheel > {
return updateViewMode( theMode ); return updateViewMode( theMode );
} }
private void updateColor() {
if(isUpdateColor) {
System.out.println("colorwheel update");
_myColorValue = HSLtoRGB(hsl);
setValue(_myColorValue);
isUpdateColor = false;
}
}
/** /**
* @exclude * @exclude
*/ */
@ -315,9 +334,11 @@ public class ColorWheel extends Controller< ColorWheel > {
public void display( PGraphics theGraphics , ColorWheel theController ) { public void display( PGraphics theGraphics , ColorWheel theController ) {
updateColor();
PGraphics buffer = _myColorResources.get( "default" ); PGraphics buffer = _myColorResources.get( "default" );
theGraphics.fill( 0 , 100 ); theGraphics.fill( getColor().getBackground());
theGraphics.rect( 0 , 0 , getWidth( ) , getHeight( ) ); theGraphics.rect( 0 , 0 , getWidth( ) , getHeight( ) );
theGraphics.ellipseMode( PApplet.CENTER ); theGraphics.ellipseMode( PApplet.CENTER );
theGraphics.pushMatrix( ); theGraphics.pushMatrix( );