Commit ab4aff9f authored by iSergio's avatar iSergio
Browse files

Merge branch '1.92' into 'develop' 

CesiumJS version up to 1.92

See merge request !33
parents c083c405 970e34ad

cesiumjs4gwt-main/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    <parent>

        <artifactId>cesiumjs4gwt</artifactId>

        <groupId>org.cesiumjs</groupId>

        <version>1.91.1</version>

        <version>1.92.0</version>

    </parent>



    <name>CesiumJS GWT Wrapper</name>

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/CesiumEntryPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class CesiumEntryPoint implements EntryPoint { 
        Cesium.fixSmartGWT();

        GWT.log("Cesium GTW module loaded");

        if (!Cesium.isInitialized()) {

            String message = "The Core of Cesium (Cesium.js) JavaScript libraryes not loaded.\n"

            String message = "The Core of Cesium (Cesium.js) JavaScript libraries not loaded.\n"

                    + "If you inherit Cesium from NoScript gwt.xml, \nyou need include <script src='..../Cesium.js'> "

                    + "to load Cesium, \nalso you need include necessary css (Example: <link type=\"text/css\" href=\".../Cesium/Widgets/widget.css\">.\n"

                    + "By default Cesium path is [GWT App Name]/js/Cesium";

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/Cartesian2.java

+11 −0
Original line number Diff line number Diff line
@@ -555,6 +555,17 @@ public class Cartesian2 implements Packable { 
    @JsMethod

    public static native Cartesian2[] unpackArray(JsArrayNumber array, Cartesian2[] result);



    /**

     * Constrain a value to lie between two values.

     * @param value The value to clamp.

     * @param min The minimum bound.

     * @param max The maximum bound.

     * @param result The object into which to store the result.

     * @return The clamped value such that min <= result <= max.

     */

    @JsMethod

    public static native Cartesian2 clamp(Cartesian2 value, Cartesian2 min, Cartesian2 max, Cartesian2 result);



    /**

     * Duplicates this Cartesian2 instance.

     *

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/Cartesian3.java

+11 −0
Original line number Diff line number Diff line
@@ -872,6 +872,17 @@ public class Cartesian3 implements Packable { 
    @JsMethod

    public static native Cartesian3[] unpackArray(JsArrayNumber array, Cartesian3[] result);



    /**

     * Constrain a value to lie between two values.

     * @param cartesian The value to clamp.

     * @param min The minimum bound.

     * @param max The maximum bound.

     * @param result The object into which to store the result.

     * @return The clamped value such that min <= value <= max.

     */

    @JsMethod

    public static native Cartesian3 clamp(Cartesian3 cartesian, Cartesian3 min, Cartesian3 max, Cartesian3 result);



    /**

     * Duplicates this Cartesian3 instance.

     *

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/core/Cartesian4.java

+11 −0
Original line number Diff line number Diff line
@@ -130,6 +130,17 @@ public class Cartesian4 implements Packable { 
    @JsMethod

    public static native Cartesian4 add(Cartesian4 left, Cartesian4 right, Cartesian4 result);



    /**

     * Constrain a value to lie between two values.

     * @param value The value to clamp.

     * @param min The minimum bound.

     * @param max The maximum bound.

     * @param result The object into which to store the result.

     * @return The clamped value such that min <= result <= max.

     */

    @JsMethod

    public static native Cartesian4 clamp(Cartesian4 value, Cartesian4 min, Cartesian4 max, Cartesian4 result);



    /**

     * Duplicates a Cartesian4 instance.

     *