Sfoglia il codice sorgente

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

RamilKadyrov 6 anni fa
parent
commit
6bb5f4ab3c

+ 26 - 4
Playground/css/index.css

@@ -421,9 +421,15 @@ body {
     cursor: pointer;
     background-color: white;
 }
-.button:hover span {
+
+.button.languageJS:hover span {
     color: #3f3461;
 }
+
+.button.languageTS:hover span {
+    color: #bb464b;
+}
+
 .languageJS .button:hover img {
     filter: invert(17%) sepia(61%) saturate(651%) hue-rotate(214deg) brightness(91%) contrast(84%);
 }
@@ -640,7 +646,7 @@ body {
     height:35px;
     width:100%;
     line-height:35px;
-    background-color: #201936;
+
 }
 
 .navbarBottom #statusBar {
@@ -650,6 +656,10 @@ body {
     padding-left:20px;
 }
 
+.navbarBottom.languageTS #statusBar {
+    color: #3f3461;
+}
+
 .navbarBottom .links {
     position:absolute;
     right: 0;
@@ -661,11 +671,13 @@ body {
     display: inline-block;
     line-height: 35px;
     font-size: 16px;
-    color: white;
 }
+
 .navbarBottom .links .link:hover {
-    background-color:#3F3461;
+    background-color:white;
+    color: #3f3461;
 }
+
 .navbarBottom .links .link a {
     text-decoration: none;
     line-height: 35px;
@@ -674,6 +686,16 @@ body {
     color: white;
 }
 
+.navbarBottom.languageJS .links .link a:hover {
+    background-color:white;
+    color: #3f3461;
+}
+
+.navbarBottom.languageTS .links .link a:hover {
+    background-color:white;
+    color: #bb464b;
+}
+
 /* Save form & co */
 .save-layer {
     display: none;

+ 4 - 1
Playground/js/settingsPG.js

@@ -17,7 +17,10 @@ class SettingsPG {
             '.navbar .select .toDisplay .subSelect .toDisplaySub',
             '#fpsLabel',
             '.save-form',
-            '#switchWrapper'
+            '#switchWrapper',
+            '.navbarBottom',
+            '.navbarBottom .links .link a',
+            '.button'
         ];
         // The elements that will color with theme
         this.elementToTheme = [

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/babylon.js


File diff suppressed because it is too large
+ 131 - 113
dist/preview release/babylon.max.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/babylon.max.js.map


+ 2 - 0
dist/preview release/babylon.module.d.ts

@@ -36087,6 +36087,7 @@ declare module "babylonjs/Actions/interpolateValueAction" {
     }
 }
 declare module "babylonjs/Actions/index" {
+    export * from "babylonjs/Actions/abstractActionManager";
     export * from "babylonjs/Actions/action";
     export * from "babylonjs/Actions/actionEvent";
     export * from "babylonjs/Actions/actionManager";
@@ -43733,6 +43734,7 @@ declare module "babylonjs/Cameras/index" {
     export * from "babylonjs/Cameras/flyCamera";
     export * from "babylonjs/Cameras/flyCameraInputsManager";
     export * from "babylonjs/Cameras/followCamera";
+    export * from "babylonjs/Cameras/followCameraInputsManager";
     export * from "babylonjs/Cameras/gamepadCamera";
     export * from "babylonjs/Cameras/Stereoscopic/index";
     export * from "babylonjs/Cameras/universalCamera";

+ 2 - 0
dist/preview release/viewer/babylon.module.d.ts

@@ -36087,6 +36087,7 @@ declare module "babylonjs/Actions/interpolateValueAction" {
     }
 }
 declare module "babylonjs/Actions/index" {
+    export * from "babylonjs/Actions/abstractActionManager";
     export * from "babylonjs/Actions/action";
     export * from "babylonjs/Actions/actionEvent";
     export * from "babylonjs/Actions/actionManager";
@@ -43733,6 +43734,7 @@ declare module "babylonjs/Cameras/index" {
     export * from "babylonjs/Cameras/flyCamera";
     export * from "babylonjs/Cameras/flyCameraInputsManager";
     export * from "babylonjs/Cameras/followCamera";
+    export * from "babylonjs/Cameras/followCameraInputsManager";
     export * from "babylonjs/Cameras/gamepadCamera";
     export * from "babylonjs/Cameras/Stereoscopic/index";
     export * from "babylonjs/Cameras/universalCamera";

File diff suppressed because it is too large
+ 7 - 7
dist/preview release/viewer/babylon.viewer.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/viewer/babylon.viewer.max.js


+ 3 - 1
src/Helpers/videoDome.ts

@@ -229,8 +229,10 @@ export class VideoDome extends TransformNode {
                 // in half-dome mode the uScale should be double of 360 videos
                 // Use 0.99999 to boost perf by not switching program
                 this._videoTexture.uScale = this._halfDome ? 0.99999 : 0.5;
+                const rightOffset = this._halfDome ? 0.0 : 0.5;
+                const leftOffset = this._halfDome ? 0.5 : 0.0;
                 this._onBeforeCameraRenderObserver = this._scene.onBeforeCameraRenderObservable.add((camera) => {
-                    this._videoTexture.uOffset = camera.isRightCamera ? 0.5 : 0.0;
+                    this._videoTexture.uOffset = camera.isRightCamera ? rightOffset : leftOffset;
                 });
                 break;
             case VideoDome.MODE_TOPBOTTOM: