Home Explore Help
Register Sign In
zhangyupeng
/
Babylon.js
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

moved main color for the environment to the labs

Raanan Weber 7 years ago
parent
596a132c9e
commit
ffcefd172b
3 changed files with 9 additions and 8 deletions
Unified View Show Diff Stats
  1. 3 1
      Viewer/dist/ufoExample.html
  2. 1 1
      Viewer/src/configuration/configuration.ts
  3. 5 6
      Viewer/src/viewer/sceneManager.ts

+ 3 - 1
Viewer/dist/ufoExample.html
View File 

@@ -20,8 +20,10 @@
 
     <body>

     <body>

         <babylon extends="default, shadowDirectionalLight, environmentMap" templates.nav-bar.params.disable-on-fullscreen="true">

         <babylon extends="default, shadowDirectionalLight, environmentMap" templates.nav-bar.params.disable-on-fullscreen="true">

             <scene glow="true">

             <scene glow="true">

-                <environment-main-color r="0.5" g="0.2" b="0.2"></environment-main-color>

             </scene>

             </scene>

+            <lab>

+                <environment-main-color r="0.5" g="0.2" b="0.2"></environment-main-color>

+            </lab>

             <model url="https://models.babylonjs.com/ufo.glb">

             <model url="https://models.babylonjs.com/ufo.glb">

                 <animation auto-start="true"></animation>

                 <animation auto-start="true"></animation>

             </model>

             </model>

+ 1 - 1
Viewer/src/configuration/configuration.ts
View File 

@@ -89,6 +89,7 @@ export interface ViewerConfiguration {
 
         }

         }

         hideLoadingDelay?: number;

         hideLoadingDelay?: number;

         assetsRootURL?: string;

         assetsRootURL?: string;

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

         environmentMap?: {

         environmentMap?: {

             /**

             /**

              * Environment map texture path in relative to the asset folder.

              * Environment map texture path in relative to the asset folder.

@@ -265,7 +266,6 @@ export interface ISceneConfiguration {
 
     debug?: boolean;

     debug?: boolean;

     clearColor?: { r: number, g: number, b: number, a: number };

     clearColor?: { r: number, g: number, b: number, a: number };

     mainColor?: { r: number, g: number, b: number };

     mainColor?: { r: number, g: number, b: number };

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

     imageProcessingConfiguration?: IImageProcessingConfiguration;

     imageProcessingConfiguration?: IImageProcessingConfiguration;

     environmentTexture?: string;

     environmentTexture?: string;

     colorGrading?: IColorGradingConfiguration;

     colorGrading?: IColorGradingConfiguration;

+ 5 - 6
Viewer/src/viewer/sceneManager.ts
View File 

@@ -416,6 +416,11 @@ export class SceneManager {
 
                     this.defaultRenderingPipelineEnabled = true;

                     this.defaultRenderingPipelineEnabled = true;

                 }

                 }

             }

             }

+

+            if (newConfiguration.lab.environmentMainColor) {

+                let mainColor = new Color3().copyFrom(newConfiguration.lab.environmentMainColor as Color3);

+                this.environmentHelper.setMainColor(mainColor);

+            }

         }

         }

 

 

         if (this._defaultRenderingPipeline && this._defaultRenderingPipeline.imageProcessing) {

         if (this._defaultRenderingPipeline && this._defaultRenderingPipeline.imageProcessing) {

@@ -929,12 +934,6 @@ export class SceneManager {
 
             this.environmentHelper.rootMesh.rotation.y = this._viewer.configuration.scene.environmentRotationY;

             this.environmentHelper.rootMesh.rotation.y = this._viewer.configuration.scene.environmentRotationY;

         }

         }

 

 

-        if (this._viewer.configuration.scene && this._viewer.configuration.scene.environmentMainColor) {

-            let mainColor = new Color3().copyFrom(this._viewer.configuration.scene.environmentMainColor as Color3);

-            this.environmentHelper.setMainColor(mainColor);

-        }

-

-

         let groundConfig = (typeof groundConfiguration === 'boolean') ? {} : groundConfiguration;

         let groundConfig = (typeof groundConfiguration === 'boolean') ? {} : groundConfiguration;

         if (this.environmentHelper.groundMaterial && groundConfig && groundConfig.material) {

         if (this.environmentHelper.groundMaterial && groundConfig && groundConfig.material) {

             //if (!this.environmentHelper.groundMaterial._perceptualColor) {

             //if (!this.environmentHelper.groundMaterial._perceptualColor) {