Commit c4997481 authored by iSergio's avatar iSergio
Browse files

Fix examples with double value slider

parent 1d981a24

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/AmbientOcclusion.java

+26 −34
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ public class AmbientOcclusion extends AbstractExample { 
    private CheckBox ambientOcclusionOnlyCBox;

    private SliderBox intensitySlider;

    private SliderBox lengthCapSlider;

//    private SliderBox stepSizeSlider;

//    private SliderBox biasSlider;

//    private SliderBox blurStepSize;

    private SliderBox stepSizeSlider;

    private SliderBox biasSlider;

    private SliderBox blurStepSize;



    @Inject

    public AmbientOcclusion(ShowcaseExampleStore store) {
@@ -67,7 +67,7 @@ public class AmbientOcclusion extends AbstractExample { 
        }



        // Power Plant design model provided by Bentley Systems

        Cesium3DTileset tileset = Cesium3DTileset.create(IonResource.fromAssetId(3837));

        Cesium3DTileset tileset = Cesium3DTileset.create(IonResource.fromAssetId(1240402));

        tileset.readyPromise().then(

                value -> csVPanel.getViewer().scene().primitives().add(value),

                value -> Cesium.log("Error load tileset")
@@ -89,17 +89,17 @@ public class AmbientOcclusion extends AbstractExample { 
        lengthCapSlider.setWidth("150px");

        lengthCapSlider.addInputHandler(this::updatePostProcess);



//        stepSizeSlider = new SliderBox(1.0, 1.0, 10.0, 0.01);

//        stepSizeSlider.setWidth("150px");

//        stepSizeSlider.addInputHandler(this::updatePostProcess);

//

//        biasSlider = new SliderBox(0.0, 0.1, 1.0, 0.01);

//        biasSlider.setWidth("150px");

//        biasSlider.addInputHandler(this::updatePostProcess);

//

//        blurStepSize = new SliderBox(0.0, 0.86, 4.0, 0.01);

//        blurStepSize.setWidth("150px");

//        blurStepSize.addInputHandler(this::updatePostProcess);

        stepSizeSlider = new SliderBox(1.0, 1.0, 10.0, 0.01);

        stepSizeSlider.setWidth("150px");

        stepSizeSlider.addInputHandler(this::updatePostProcess);



        biasSlider = new SliderBox(0.0, 0.1, 1.0, 0.01);

        biasSlider.setWidth("150px");

        biasSlider.addInputHandler(this::updatePostProcess);



        blurStepSize = new SliderBox(0.0, 0.86, 4.0, 0.01);

        blurStepSize.setWidth("150px");

        blurStepSize.addInputHandler(this::updatePostProcess);



        FlexTable flexTable = new FlexTable();

        flexTable.setHTML(1, 0, "<font color=\"white\">Ambient Occlusion</font>");
@@ -110,12 +110,12 @@ public class AmbientOcclusion extends AbstractExample { 
        flexTable.setWidget(3, 1, intensitySlider);

        flexTable.setHTML(4, 0, "<font color=\"white\">Length Cap</font>");

        flexTable.setWidget(4, 1, lengthCapSlider);

//        flexTable.setHTML(5, 0, "<font color=\"white\">Step Size</font>");

//        flexTable.setWidget(5, 1, stepSizeSlider);

//        flexTable.setHTML(6, 0, "<font color=\"white\">Bias</font>");

//        flexTable.setWidget(6, 1, biasSlider);

//        flexTable.setHTML(7, 0, "<font color=\"white\">Blur Step Size</font>");

//        flexTable.setWidget(7, 1, blurStepSize);

        flexTable.setHTML(5, 0, "<font color=\"white\">Step Size</font>");

        flexTable.setWidget(5, 1, stepSizeSlider);

        flexTable.setHTML(6, 0, "<font color=\"white\">Bias</font>");

        flexTable.setWidget(6, 1, biasSlider);

        flexTable.setHTML(7, 0, "<font color=\"white\">Blur Step Size</font>");

        flexTable.setWidget(7, 1, blurStepSize);



        AbsolutePanel absPanel = new AbsolutePanel();

        absPanel.add(csVPanel);
@@ -136,22 +136,14 @@ public class AmbientOcclusion extends AbstractExample { 
    }



    private void updatePostProcess(InputEvent event) {

//        if (event != null) {

//            SliderBox source = (SliderBox) event.getSource();

//            double value = Double.parseDouble(source.getValue());

//            GWT.log(value + " - " + intensitySlider.getValue());

//            return;

//        }

//        GWT.log(intensitySlider.getValue() + " - " + lengthCapSlider.getValue() + " - " + blurStepSize.getValue());



        PostProcessStageComposite ambientOcclusion = csVPanel.getViewer().scene().postProcessStages.ambientOcclusion();

        ambientOcclusion.enabled = ambientOcclusionCBox.getValue() || ambientOcclusionOnlyCBox.getValue();

        ambientOcclusion.uniforms.setProperty("ambientOcclusionOnly", ambientOcclusionOnlyCBox.getValue());

        ambientOcclusion.uniforms.setProperty("intensity", Double.parseDouble(intensitySlider.getValue()));

//        ambientOcclusion.uniforms.setProperty("bias", Double.parseDouble(biasSlider.getValue()));

        ambientOcclusion.uniforms.setProperty("lengthCap", Double.parseDouble(lengthCapSlider.getValue()));

//        ambientOcclusion.uniforms.setProperty("stepSize", Double.parseDouble(stepSizeSlider.getValue()));

//        ambientOcclusion.uniforms.setProperty("blurStepSize", Double.parseDouble(blurStepSize.getValue()));

        ambientOcclusion.uniforms.setProperty("intensity", intensitySlider.getValue());

        ambientOcclusion.uniforms.setProperty("bias", biasSlider.getValue());

        ambientOcclusion.uniforms.setProperty("lengthCap", lengthCapSlider.getValue());

        ambientOcclusion.uniforms.setProperty("stepSize", stepSizeSlider.getValue());

        ambientOcclusion.uniforms.setProperty("blurStepSize", blurStepSize.getValue());

    }



    @Override

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/Bloom.java

+5 −5
Original line number Diff line number Diff line
@@ -146,11 +146,11 @@ public class Bloom extends AbstractExample { 
        PostProcessStageComposite bloom = csVPanel.getViewer().scene().postProcessStages.bloom();

        bloom.enabled = bloomCBox.getValue();

        bloom.uniforms.setProperty("glowOnly", glowOnlyCBox.getValue());

        bloom.uniforms.setProperty("contrast", Double.parseDouble(contrastSlider.getValue()));

        bloom.uniforms.setProperty("brightness", Double.parseDouble(brightnessSlider.getValue()));

        bloom.uniforms.setProperty("delta", Double.parseDouble(deltaSlider.getValue()));

        bloom.uniforms.setProperty("sigma", Double.parseDouble(sigmaSlider.getValue()));

        bloom.uniforms.setProperty("stepSize", Double.parseDouble(stepSizeSlider.getValue()));

        bloom.uniforms.setProperty("contrast", contrastSlider.getValue());

        bloom.uniforms.setProperty("brightness", brightnessSlider.getValue());

        bloom.uniforms.setProperty("delta", deltaSlider.getValue());

        bloom.uniforms.setProperty("sigma", sigmaSlider.getValue());

        bloom.uniforms.setProperty("stepSize", stepSizeSlider.getValue());

    }



    @Override

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/CloudParameters.java

+8 −8
Original line number Diff line number Diff line
@@ -272,21 +272,21 @@ public class CloudParameters extends AbstractExample { 


    private void onSliderInput(InputEvent event) {

        SliderBox source = (SliderBox) event.getSource();

        String value = source.getValue();

        double value = source.getValue();

        if (source.equals(scaleXSlider)) {

            onScaleXInput(value);

            onScaleXInput(String.valueOf(value));

        } else if (source.equals(scaleYSlider)) {

            onScaleYInput(value);

            onScaleYInput(String.valueOf(value));

        } else if (source.equals(maxSizeXSlider)) {

            onMaxSizeXInput(value);

            onMaxSizeXInput(String.valueOf(value));

        } else if (source.equals(maxSizeYSlider)) {

            onMaxSizeYInput(value);

            onMaxSizeYInput(String.valueOf(value));

        } else if (source.equals(maxSizeZSlider)) {

            onMaxSizeZInput(value);

            onMaxSizeZInput(String.valueOf(value));

        } else if (source.equals(sliceSlider)) {

            onSliceInput(value);

            onSliceInput(String.valueOf(value));

        } else if (source.equals(brightnessSlider)) {

            onBrightnessInput(value);

            onBrightnessInput(String.valueOf(value));

        }

    }

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/Clustering.java

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ import org.cesiumjs.cs.Cesium; 
import org.cesiumjs.cs.core.Color;

import org.cesiumjs.cs.core.Event;

import org.cesiumjs.cs.core.PinBuilder;

import org.cesiumjs.cs.datasources.Entity;

import org.cesiumjs.cs.datasources.EntityCluster;

import org.cesiumjs.cs.datasources.EntityClusterObject;

import org.cesiumjs.cs.datasources.KmlDataSource;

import org.cesiumjs.cs.datasources.options.KmlDataSourceLoadStaticOptions;

import org.cesiumjs.cs.js.JsObject;
@@ -213,7 +211,7 @@ public class Clustering extends AbstractExample { 


    private void onInput(InputEvent event) {

        SliderBox source = (SliderBox) event.getSource();

        double value = Double.parseDouble(source.getValue());

        double value = source.getValue();

        if (source.getElement().getId().equalsIgnoreCase("pixelRange")) {

            dataSource.clustering.pixelRange = (int) value;

            pixelRangeTBox.setValue("" + value);

cesiumjs4gwt-showcase/src/main/java/org/cleanlogic/cesiumjs4gwt/showcase/examples/DepthOfField.java

+3 −3
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ public class DepthOfField extends AbstractExample { 
    private void updatePostProcess(InputEvent event) {

        depthOfField.enabled = depthOfFieldCBox.getValue();

        depthOfField.uniforms.setProperty("focalDistance", focalDistanceSlider.getValue());

        depthOfField.uniforms.setProperty("delta", Double.parseDouble(deltaSlider.getValue()));

        depthOfField.uniforms.setProperty("sigma", Double.parseDouble(sigmaSlider.getValue()));

        depthOfField.uniforms.setProperty("stepSize", Double.parseDouble(stepSizeSlider.getValue()));

        depthOfField.uniforms.setProperty("delta", deltaSlider.getValue());

        depthOfField.uniforms.setProperty("sigma", sigmaSlider.getValue());

        depthOfField.uniforms.setProperty("stepSize", stepSizeSlider.getValue());

    }



    private class MValueChangeHandler implements ValueChangeHandler<Boolean> {