Skip to content

Commit

Permalink
Merge pull request BabylonJS#6798 from sebavan/master
Browse files Browse the repository at this point in the history
Nightly
  • Loading branch information
sebavan committed Aug 29, 2019
2 parents 3a82a0a + 8a75049 commit 6a3c357
Show file tree
Hide file tree
Showing 91 changed files with 19,869 additions and 35,025 deletions.
4 changes: 4 additions & 0 deletions Playground/babylon.d.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40305,6 +40305,10 @@ declare module BABYLON {
* If the gaze trackers color should be updated when selecting meshes
*/
updateGazeTrackerColor: boolean;
/**
* If the controller laser color should be updated when selecting meshes
*/
updateControllerLaserColor: boolean;
/**
* The gaze tracking mesh corresponding to the left controller
*/
Expand Down
4 changes: 4 additions & 0 deletions dist/preview release/babylon.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41023,6 +41023,10 @@ declare module BABYLON {
* If the gaze trackers color should be updated when selecting meshes
*/
updateGazeTrackerColor: boolean;
/**
* If the controller laser color should be updated when selecting meshes
*/
updateControllerLaserColor: boolean;
/**
* The gaze tracking mesh corresponding to the left controller
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/preview release/babylon.js

Large diffs are not rendered by default.

110 changes: 53 additions & 57 deletions dist/preview release/babylon.max.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/preview release/babylon.max.js.map

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions dist/preview release/babylon.module.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42440,6 +42440,10 @@ declare module "babylonjs/Cameras/VR/vrExperienceHelper" {
* If the gaze trackers color should be updated when selecting meshes
*/
updateGazeTrackerColor: boolean;
/**
* If the controller laser color should be updated when selecting meshes
*/
updateControllerLaserColor: boolean;
/**
* The gaze tracking mesh corresponding to the left controller
*/
Expand Down Expand Up @@ -106596,6 +106600,10 @@ declare module BABYLON {
* If the gaze trackers color should be updated when selecting meshes
*/
updateGazeTrackerColor: boolean;
/**
* If the controller laser color should be updated when selecting meshes
*/
updateControllerLaserColor: boolean;
/**
* The gaze tracking mesh corresponding to the left controller
*/
Expand Down
4 changes: 4 additions & 0 deletions dist/preview release/documentation.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41023,6 +41023,10 @@ declare module BABYLON {
* If the gaze trackers color should be updated when selecting meshes
*/
updateGazeTrackerColor: boolean;
/**
* If the controller laser color should be updated when selecting meshes
*/
updateControllerLaserColor: boolean;
/**
* The gaze tracking mesh corresponding to the left controller
*/
Expand Down
23 changes: 6 additions & 17 deletions dist/preview release/gui/babylon.gui.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ ({

/***/ "../../node_modules/tslib/tslib.es6.js":
/*!***********************************************************!*\
!*** C:/Repos/Babylon.js/node_modules/tslib/tslib.es6.js ***!
\***********************************************************/
/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
/*!*****************************************************************!*\
!*** C:/Dev/Babylon/Babylon.js/node_modules/tslib/tslib.es6.js ***!
\*****************************************************************/
/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __exportStar, __values, __read, __spread, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault */
/***/ (function(module, __webpack_exports__, __webpack_require__) {

"use strict";
Expand All @@ -117,7 +117,6 @@ __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
Expand Down Expand Up @@ -170,10 +169,8 @@ function __rest(s, e) {
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
t[p] = s[p];
if (s != null && typeof Object.getOwnPropertySymbols === "function")
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
t[p[i]] = s[p[i]];
}
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
t[p[i]] = s[p[i]];
return t;
}

Expand Down Expand Up @@ -267,14 +264,6 @@ function __spread() {
return ar;
}

function __spreadArrays() {
for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
for (var r = Array(s), k = 0, i = 0; i < il; i++)
for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
r[k] = a[j];
return r;
};

function __await(v) {
return this instanceof __await ? (this.v = v, this) : new __await(v);
}
Expand Down
2 changes: 1 addition & 1 deletion dist/preview release/gui/babylon.gui.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/preview release/gui/babylon.gui.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 6a3c357

Please sign in to comment.