Merge

dist/preview release/materialsLibrary/babylonjs.materials.d.ts

@@ -30,8 +30,8 @@ declare module BABYLON {
         offset: number;
         scale: number;
         smoothness: number;
+        private _disableLighting;
         disableLighting: boolean;
-        private _scaledDiffuse;
         private _renderId;
         constructor(name: string, scene: Scene);
         needAlphaBlending(): boolean;

dist/preview release/materialsLibrary/babylonjs.materials.module.d.ts

@@ -35,8 +35,8 @@ declare module BABYLON {
         offset: number;
         scale: number;
         smoothness: number;
+        private _disableLighting;
         disableLighting: boolean;
-        private _scaledDiffuse;
         private _renderId;
         constructor(name: string, scene: Scene);
         needAlphaBlending(): boolean;

dist/preview release/viewer/babylon.viewer.d.ts

@@ -437,6 +437,49 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
+    /**
+        * The data structure of a telemetry event.
+        */
+    export interface TelemetryData {
+            event: string;
+            session: string;
+            date: Date;
+            now: number;
+            viewerId?: string;
+            detail: any;
+    }
+    /**
+        * Receives Telemetry events and raises events to the API
+        */
+    export class TelemetryManager {
+            onEventBroadcastedObservable: BABYLON.Observable<TelemetryData>;
+            /**
+                * Receives a telemetry event
+                * @param event The name of the Telemetry event
+                * @param details An additional value, or an object containing a list of property/value pairs
+                */
+            readonly broadcast: (event: string, viewerId?: string | undefined, details?: any) => void;
+            /**
+                * Log a Telemetry event for errors raised on the WebGL context.
+                * @param engine The Babylon engine with the WebGL context.
+                */
+            flushWebGLErrors(engine: BABYLON.Engine, viewerId?: string): void;
+            /**
+                * Enable or disable telemetry events
+                * @param enabled Boolan, true if events are enabled
+                */
+            enable: boolean;
+            /**
+                * Returns the current session ID or creates one if it doesn't exixt
+                * @return The current session ID
+                */
+            readonly session: string;
+            /**
+                * Disposes the telemetry manager
+                */
+            dispose(): void;
+    }
+    export const telemetryManager: TelemetryManager;
 }
 declare module BabylonViewer {
     /**

dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -480,7 +480,50 @@ declare module 'babylonjs-viewer/viewer/viewer' {
 }
 
 declare module 'babylonjs-viewer/managers/telemetryManager' {
-    
+    import { Engine, Observable } from "babylonjs";
+    /**
+        * The data structure of a telemetry event.
+        */
+    export interface TelemetryData {
+            event: string;
+            session: string;
+            date: Date;
+            now: number;
+            viewerId?: string;
+            detail: any;
+    }
+    /**
+        * Receives Telemetry events and raises events to the API
+        */
+    export class TelemetryManager {
+            onEventBroadcastedObservable: Observable<TelemetryData>;
+            /**
+                * Receives a telemetry event
+                * @param event The name of the Telemetry event
+                * @param details An additional value, or an object containing a list of property/value pairs
+                */
+            readonly broadcast: (event: string, viewerId?: string | undefined, details?: any) => void;
+            /**
+                * Log a Telemetry event for errors raised on the WebGL context.
+                * @param engine The Babylon engine with the WebGL context.
+                */
+            flushWebGLErrors(engine: Engine, viewerId?: string): void;
+            /**
+                * Enable or disable telemetry events
+                * @param enabled Boolan, true if events are enabled
+                */
+            enable: boolean;
+            /**
+                * Returns the current session ID or creates one if it doesn't exixt
+                * @return The current session ID
+                */
+            readonly session: string;
+            /**
+                * Disposes the telemetry manager
+                */
+            dispose(): void;
+    }
+    export const telemetryManager: TelemetryManager;
 }
 
 declare module 'babylonjs-viewer/loader/modelLoader' {

dist/preview release/what's new.md

@@ -104,6 +104,7 @@
 
 ### Materials Library
 - Added the `cameraOffset` vector property in the `SkyMaterial` to get an offset according to the horizon ([julien-moreau](https://github.com/julien-moreau))
+- Fixed `GradientMaterial` to consider disableLighting working as emissive ([julien-moreau](https://github.com/julien-moreau))
 
 ## Bug fixes
 - Fixed TransformNode.setDirection (orientation was wrong) ([Deltakosh](https://github.com/deltakosh))

materialsLibrary/src/gradient/gradient.fragment.fx

@@ -2,7 +2,6 @@
 
 // Constants
 uniform vec3 vEyePosition;
-uniform vec4 vDiffuseColor;
 
 // Gradient variables
 uniform vec4 topColor;
@@ -36,13 +35,6 @@ varying vec4 vColor;
 #include<lightsFragmentFunctions>
 #include<shadowsFragmentFunctions>
 
-// Samplers
-#ifdef DIFFUSE
-varying vec2 vDiffuseUV;
-uniform sampler2D diffuseSampler;
-uniform vec2 vDiffuseInfos;
-#endif
-
 #include<clipPlaneFragmentDeclaration>
 
 // Fog
@@ -84,15 +76,16 @@ void main(void) {
 #endif
 
 	// Lighting
+#ifdef EMISSIVE
+	vec3 diffuseBase = baseColor.rgb;
+#else
 	vec3 diffuseBase = vec3(0., 0., 0.);
+#endif
     lightingInfo info;
 	float shadow = 1.;
     float glossiness = 0.;
     
-#include<lightFragment>[0]
-#include<lightFragment>[1]
-#include<lightFragment>[2]
-#include<lightFragment>[3]
+#include<lightFragment>[0..maxSimultaneousLights]
 
 #ifdef VERTEXALPHA
 	alpha *= vColor.a;

materialsLibrary/src/gradient/gradient.vertex.fx

@@ -23,12 +23,6 @@ attribute vec4 color;
 uniform mat4 view;
 uniform mat4 viewProjection;
 
-#ifdef DIFFUSE
-varying vec2 vDiffuseUV;
-uniform mat4 diffuseMatrix;
-uniform vec2 vDiffuseInfos;
-#endif
-
 #ifdef POINTSIZE
 uniform float pointSize;
 #endif
@@ -71,17 +65,6 @@ void main(void) {
 	vec2 uv2 = vec2(0., 0.);
 #endif
 
-#ifdef DIFFUSE
-	if (vDiffuseInfos.x == 0.)
-	{
-		vDiffuseUV = vec2(diffuseMatrix * vec4(uv, 1.0, 0.0));
-	}
-	else
-	{
-		vDiffuseUV = vec2(diffuseMatrix * vec4(uv2, 1.0, 0.0));
-	}
-#endif
-
 	// Clip plane
 #include<clipPlaneVertex>