Merge branch '1.89' into 'develop' (eaf1ad1b) · Commits · iSergio / cesiumjs4gwt

.gitlab-ci.yml

+14 −8

Original line number	Diff line number	Diff line
		@@ -41,16 +41,19 @@ default:

		compile:cesiumjs4gwt-main:
		stage: build
		needs: []
		script:
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-main -DskipTests=true compile

		compile:cesiumjs4gwt-showcase:
		stage: build
		needs: ["compile:cesiumjs4gwt-main"]
		script:
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-showcase -DskipTests=true compile -am -DskipTests=true

		package:cesiumjs4gwt-main:
		stage: package
		needs: ["compile:cesiumjs4gwt-main"]
		only:
		- master
		- develop
		@@ -58,32 +61,35 @@ package:cesiumjs4gwt-main:
		script:
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-main -DskipTests=true package

		deploy:cesiumjs4gwt-main:
		stage: deploy
		package:cesiumjs4gwt-showcase:
		stage: package
		needs: ["package:cesiumjs4gwt-main"]
		only:
		- master
		- develop
		- tags
		script:
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-main -DskipTests=true deploy
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-showcase package -am -DskipTests=true
		artifacts:
		paths:
		- cesiumjs4gwt-main/target/*.jar
		- cesiumjs4gwt-showcase/target/*.war

		package:cesiumjs4gwt-showcase:
		stage: package
		deploy:cesiumjs4gwt-main:
		stage: deploy
		needs: ["package:cesiumjs4gwt-main"]
		only:
		- master
		- develop
		- tags
		script:
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-showcase package -am -DskipTests=true
		- mvn $MAVEN_CLI_OPTS -pl cesiumjs4gwt-main -DskipTests=true deploy
		artifacts:
		paths:
		- cesiumjs4gwt-showcase/target/*.war
		- cesiumjs4gwt-main/target/*.jar

		deploy:cesiumjs4gwt-showcase:
		stage: deploy
		needs: ["package:cesiumjs4gwt-showcase"]
		only:
		- master
		- develop

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		<parent>
		<artifactId>cesiumjs4gwt</artifactId>
		<groupId>org.cesiumjs</groupId>
		<version>1.88.0</version>
		<version>1.89.0</version>
		</parent>

		<name>CesiumJS GWT Wrapper</name>

+8 −0

Original line number	Diff line number	Diff line
		@@ -549,6 +549,14 @@ public class Cesium3DTileset {
		@JsProperty(name = "ellipsoid")
		public native Ellipsoid ellipsoid();

		/**
		* If true, ModelExperimental will be used instead of {@link Model} for each tile with a glTF or 3D Tiles 1.0
		* content (where applicable).
		* The value defaults to {@link org.cesiumjs.cs.Cesium.ExperimentalFeatures#enableModelExperimental}.
		*/
		@JsProperty
		public boolean enableModelExperimental;

		/**
		* Gets the tileset's extensions object property.
		*/

+6 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,12 @@ public class Globe {
		*/
		@JsProperty
		public ImageryLayerCollection imageryLayers;
		/**
		* A multiplier to adjust terrain lambert lighting. This number is multiplied by the result of czm_getLambertDiffuse in GlobeFS.glsl. This only takes effect when enableLighting is true.
		* Default: 0.9
		*/
		@JsProperty
		public double lambertDiffuseMultiplier;
		/**
		* The distance where lighting resumes. This only takes effect when
		* enableLighting is true. Default: 9000000.0

+0 −8

Original line number	Diff line number	Diff line
		@@ -109,14 +109,6 @@ public class Scene {
		*/
		@JsProperty
		public boolean debugShowFrustums;
		/**
		* This property is for debugging only; it is not for production use. Displays
		* depth information for the indicated frustum
		* <p>
		* Default: false
		*/
		@JsProperty
		public boolean debugShowGlobeDepth;
		/**
		* The eye separation distance in meters for use with cardboard or WebVR.
		*/