Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
zhangyupeng
/
Babylon.js
1
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

Eliminating array from the configuration.
This was done to allow html configuration of every aspect in the viewer. The basic example shows a way to set the auto-rotate behavior from html. To disable it, one must simply change the "0" to "false".

Raanan Weber 7 éve
szülő
b6c022824a
commit
4b23a2eff6
3 módosított fájl, 47 hozzáadás és 40 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 1 1
      Viewer/dist/basicExample.html
  2. 39 33
      Viewer/src/configuration/configuration.ts
  3. 7 6
      Viewer/src/viewer/defaultViewer.ts

+ 1 - 1
Viewer/dist/basicExample.html
Fájl Megtekintése 

@@ -18,7 +18,7 @@
 
 

     <body>

         <babylon model.title="Amazing Rabbit" model.subtitle="BabylonJS" model.thumbnail="https://www.babylonjs.com/img/favicon/apple-icon-144x144.png"

-            model.url="https://playground.babylonjs.com/scenes/Rabbit.babylon" default-viewer="true" templates.nav-bar.params.disable-on-fullscreen="true"></babylon>

+            model.url="https://playground.babylonjs.com/scenes/Rabbit.babylon" camera.behaviors.auto-rotate="0" templates.nav-bar.params.disable-on-fullscreen="true"></babylon>

         <script src="viewer.js"></script>

     </body>

+ 39 - 33
Viewer/src/configuration/configuration.ts
Fájl Megtekintése 

@@ -62,10 +62,12 @@ export interface ViewerConfiguration {
 
         minZ?: number;

         maxZ?: number;

         inertia?: number;

-        behaviors?: Array<number | {

-            type: number;

-            [propName: string]: any;

-        }>;

+        behaviors?: {

+            [name: string]: number | {

+                type: number;

+                [propName: string]: any;

+            };

+        };

 

         [propName: string]: any;

     },

@@ -93,33 +95,37 @@ export interface ViewerConfiguration {
 
             [propName: string]: any;

         }

     };

-    lights?: Array<{

-        type: number;

-        name?: string;

-        disabled?: boolean;

-        position?: { x: number, y: number, z: number };

-        target?: { x: number, y: number, z: number };

-        direction?: { x: number, y: number, z: number };

-        diffuse?: { r: number, g: number, b: number };

-        specular?: { r: number, g: number, b: number };

-        intensity?: number;

-        radius?: number;

-        shadownEnabled?: boolean; // only on specific lights!

-        shadowConfig?: {

-            useBlurExponentialShadowMap?: boolean;

-            useKernelBlur?: boolean;

-            blurKernel?: number;

-            blurScale?: number;

-            [propName: string]: any;

-        }

-        [propName: string]: any;

-

-        // no behaviors for light at the moment, but allowing configuration for future reference.

-        behaviors?: Array<number | {

+    lights?: {

+        [name: string]: {

             type: number;

+            name?: string;

+            disabled?: boolean;

+            position?: { x: number, y: number, z: number };

+            target?: { x: number, y: number, z: number };

+            direction?: { x: number, y: number, z: number };

+            diffuse?: { r: number, g: number, b: number };

+            specular?: { r: number, g: number, b: number };

+            intensity?: number;

+            radius?: number;

+            shadownEnabled?: boolean; // only on specific lights!

+            shadowConfig?: {

+                useBlurExponentialShadowMap?: boolean;

+                useKernelBlur?: boolean;

+                blurKernel?: number;

+                blurScale?: number;

+                [propName: string]: any;

+            }

             [propName: string]: any;

-        }>

-    }>

+

+            // no behaviors for light at the moment, but allowing configuration for future reference.

+            behaviors?: {

+                [name: string]: number | {

+                    type: number;

+                    [propName: string]: any;

+                };

+            };

+        }

+    },

     // engine configuration. optional!

     engine?: {

         antialiasing?: boolean;

@@ -232,14 +238,14 @@ export let defaultConfiguration: ViewerConfiguration = {
 
 

     },

     camera: {

-        behaviors: [

-            0,

-            {

+        behaviors: {

+            autoRotate: 0,

+            framing: {

                 type: 2,

                 zoomOnBoundingInfo: true,

                 zoomStopsAnimation: false

             }

-        ]

+        }

     },

     /*lights: [

         {

+ 7 - 6
Viewer/src/viewer/defaultViewer.ts
Fájl Megtekintése 

@@ -299,14 +299,15 @@ export class DefaultViewer extends AbstractViewer {
 
 

         let sceneConfig = this.configuration.scene || { defaultLight: true };

 

-        if (!sceneConfig.defaultLight && (this.configuration.lights && this.configuration.lights.length)) {

+        if (!sceneConfig.defaultLight && (this.configuration.lights && Object.keys(this.configuration.lights).length)) {

             // remove old lights

             this.scene.lights.forEach(l => {

                 l.dispose();

             });

 

-            this.configuration.lights.forEach((lightConfig, idx) => {

-                lightConfig.name = lightConfig.name || 'light-' + idx;

+            Object.keys(this.configuration.lights).forEach((name, idx) => {

+                let lightConfig = this.configuration.lights && this.configuration.lights[name] || { name: name, type: 0 };

+                lightConfig.name = name;

                 let constructor = Light.GetConstructorFromName(lightConfig.type, lightConfig.name, this.scene);

                 let light = constructor();

 

@@ -354,9 +355,9 @@ export class DefaultViewer extends AbstractViewer {
 
         this.camera.maxZ = cameraConfig.maxZ || this.camera.maxZ;

 

         if (cameraConfig.behaviors) {

-            cameraConfig.behaviors.forEach((behaviorConfig) => {

-                this.setCameraBehavior(behaviorConfig, focusMeshes);

-            });

+            for (let name in cameraConfig.behaviors) {

+                this.setCameraBehavior(cameraConfig.behaviors[name], focusMeshes);

+            }

         };

 

         if (sceneConfig.autoRotate) {