extendedDefault changed to extended

Viewer/src/configuration/types/extendedDefault.ts

@@ -1,13 +1,15 @@
 import { ViewerConfiguration } from './../configuration';
 
-export let extendedDefaultConfiguration: ViewerConfiguration = {
+export let extendedConfiguration: ViewerConfiguration = {
     version: "3.2.0-alpha4",
     extends: "default",
     camera: {
-        radius: 2,
+        radius: 1.8,
         alpha: -1.5708,
         beta: Math.PI * 0.5 - 0.2618,
-        pinchPrecision: 1500
+        wheelPrecision: 300,
+        minZ: 0.1,
+        maxZ: 50,
     },
     lights: {
         "light1": {
@@ -98,7 +100,9 @@ export let extendedDefaultConfiguration: ViewerConfiguration = {
             directIntensity: 0.884,
             emissiveIntensity: 1.04,
             environmentIntensity: 0.268
-        }
+        },
+        normalize: true,
+        castShadow: true
     },
     lab: {
         environmentAssetsRootURL: '/assets/environment/',

Viewer/src/configuration/types/index.ts

@@ -1,6 +1,6 @@
 import { minimalConfiguration } from './minimal';
 import { defaultConfiguration } from './default';
-import { extendedDefaultConfiguration } from './extendedDefault';
+import { extendedConfiguration } from './extended';
 import { ViewerConfiguration } from '../configuration';
 import * as deepmerge from '../../../assets/deepmerge.min.js';
 
@@ -10,8 +10,8 @@ let getConfigurationType = function (type: string): ViewerConfiguration {
         case 'default':
             config = defaultConfiguration;
             break;
-        case 'extendedDefault':
-            config = extendedDefaultConfiguration;
+        case 'extended':
+            config = extendedConfiguration;
             break;
         case 'minimal':
             config = minimalConfiguration;

Viewer/tests/validation/config.json

@@ -5,15 +5,17 @@
             "title": "Control",
             "createMesh": true,
             "configuration": {
-                "extends": "minimal"
-            }
+                "extends": "extended"
+            },
+            "referenceImage": "Control.png"
         },
         {
             "title": "Diffuse",
             "createMesh": true,
             "createMaterial": true,
             "configuration": {
-                "extends": "minimal",
+                "extends": "extended",
+                "castShadow": true,
                 "model": {
                     "material": {
                         "albedoColor": {
@@ -29,59 +31,65 @@
                         "microSurface": 0
                     }
                 }
-            }
+            },
+            "referenceImage": "Diffuse.png"
         },
         {
-            "title": "Basic Helmet",
+            "title": "BrainStem",
             "configuration": {
-                "extends": "minimal",
-                "model": {
-                    "title": "Basic Helmet",
-                    "url": "/dist/assets/BrainStem/BrainStem.gltf"
+                "extends": "extended",
+                "skybox": {
+                    "cubeTexture": {
+                        "url": "/dist/assets/environment/DefaultSkybox_cube_radiance_256.dds",
+                        "gammaSpace": false
+                    }
                 }
             },
-            "referenceImage": "basicHelmet.png"
+            "model": "/dist/assets/BrainStem/BrainStem.gltf",
+            "referenceImage": "BrainStem.png"
         },
         {
-            "title": "Basic Helmet default",
+            "title": "BrainStem Animation",
             "configuration": {
-                "extends": "default",
+                "extends": "extended",
+                "skybox": {
+                    "cubeTexture": {
+                        "url": "/dist/assets/environment/DefaultSkybox_cube_radiance_256.dds",
+                        "gammaSpace": false
+                    }
+                },
                 "model": {
-                    "title": "Basic Helmet",
-                    "url": "/dist/assets/BrainStem/BrainStem.gltf"
+                    "animation": {
+                        "autoStart": true
+                    }
                 }
             },
-            "waitForFrame": 300,
-            "referenceImage": "basicHelmetDefault.png"
+            "waitForFrame": 80,
+            "model": "/dist/assets/BrainStem/BrainStem.gltf",
+            "referenceImage": "BrainStemAnimation1.png"
         },
         {
-            "title": "Basic helmet transformation",
+            "title": "BrainStem transformation",
             "configuration": {
-                "extends": "minimal",
+                "extends": "extended",
                 "model": {
-                    "title": "Basic Helmet",
-                    "url": "https://www.babylonjs.com/Assets/DamagedHelmet/glTF/DamagedHelmet.gltf",
                     "position": {
-                        "x": 20,
-                        "y": 10
+                        "x": 0.2,
+                        "y": 0
                     },
                     "rotation": {
-                        "y": -0.3
+                        "y": 0.9
+                    }
+                },
+                "skybox": {
+                    "cubeTexture": {
+                        "url": "/dist/assets/environment/DefaultSkybox_cube_radiance_256.dds",
+                        "gammaSpace": false
                     }
                 }
             },
-            "referenceImage": "basicHelmetTransformation.png"
-        },
-        {
-            "title": "Position",
-            "configuration": {
-                "extends": "default",
-                "model": {
-                    "title": "Basic Helmet",
-                    "url": "https://www.babylonjs.com/Assets/DamagedHelmet/glTF/DamagedHelmet.gltf"
-                }
-            },
-            "referenceImage": "basicHelmetDefault.png"
+            "model": "/dist/assets/BrainStem/BrainStem.gltf",
+            "referenceImage": "BrainStemTransformation.png"
         }
     ]
 }