Skip to content

Commit 99e179a

Browse files
committed
update babylonjs, fix space button
1 parent ff116b4 commit 99e179a

File tree

4 files changed

+44
-126
lines changed

4 files changed

+44
-126
lines changed

ReleaseNotes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* ✨ При помощи глобального флага конфигурации `forceInputProfileWebXr` можно насильно задать профиль отображаемых контроллеров. Иногда Pico неверно отображается, например через pico connect может распознаваться как oculus. Указание нужного профиля(`pico-4`) решает эту проблему.
88
* 📝 В README описано, как актуализировать 3D модели
99
* ♻ Добавлен git lfs для хранения 3D моделей контроллеров
10-
* ⬆ Babylon.JS обновлен до 7.7.0
10+
* ⬆ Babylon.JS обновлен до 7.8.0
1111
* `0.9.24`
1212
* ✨ При открытии экскурсии добавлются теги предзагрузки изображений для более оптимальной доставки контента
1313
* 🐛 Исправлена ошибка в проектах, которые не используют события с таймером

package-lock.json

Lines changed: 20 additions & 111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"author": "",
1111
"license": "ISC",
1212
"dependencies": {
13-
"@babylonjs/core": "^7.7.0",
14-
"@babylonjs/gui": "^7.7.0",
15-
"@babylonjs/inspector": "^7.7.0",
16-
"@babylonjs/loaders": "^7.7.0",
17-
"@babylonjs/materials": "^7.7.0",
13+
"@babylonjs/core": "^7.8.0",
14+
"@babylonjs/gui": "^7.8.0",
15+
"@babylonjs/inspector": "^7.8.0",
16+
"@babylonjs/loaders": "^7.8.0",
17+
"@babylonjs/materials": "^7.8.0",
1818
"bowser": "^2.11.0"
1919
},
2020
"devDependencies": {

src/Viewer.ts

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class Viewer {
6464

6565
freeCamera: FreeCamera;
6666

67-
constructor(private configuration: Configuration) {}
67+
constructor(private configuration: Configuration) { }
6868

6969
private backgroundRadius = 500;
7070

@@ -89,15 +89,24 @@ export class Viewer {
8989
this.configuration.sceneUrl,
9090
this.fullScreenGUI
9191
);
92+
let spacePressed = false;
9293
scene.onKeyboardObservable.add((ev) => {
9394
//если нажали пробел
94-
if (ev.type === KeyboardEventTypes.KEYDOWN && ev.event.key == " ") {
95-
if (ev.event.shiftKey) {
96-
if (this.viewScene.fastReturnToFirstStateEnabled) {
97-
this.goToFirstState();
95+
if (ev.event.key == " ") {
96+
if (ev.type === KeyboardEventTypes.KEYDOWN) {
97+
if (spacePressed) {
98+
return;
99+
}
100+
spacePressed = true;
101+
if (ev.event.shiftKey) {
102+
if (this.viewScene.fastReturnToFirstStateEnabled) {
103+
this.goToFirstState();
104+
}
105+
} else {
106+
this.backgroundAudio.togglePlayPause();
98107
}
99108
} else {
100-
this.backgroundAudio.togglePlayPause();
109+
spacePressed = false;
101110
}
102111
}
103112
});
@@ -252,7 +261,7 @@ export class Viewer {
252261

253262
this.fullScreenGUI.setFastReturnToFirstStateVisible(
254263
id !== this.viewScene.firstStateId &&
255-
this.viewScene.fastReturnToFirstStateEnabled
264+
this.viewScene.fastReturnToFirstStateEnabled
256265
);
257266

258267
document.title = targetPicture.title || this.viewScene.title;
@@ -280,7 +289,7 @@ export class Viewer {
280289
const material = this.linkSphereMaterials[link.colorScheme];
281290

282291
const linkToState = this.links.getLink(name, position, material, () => {
283-
let rotateCam = () => {};
292+
let rotateCam = () => { };
284293
if (link.rotationAfterStepAngleOverridden) {
285294
rotateCam = () => {
286295
this.rotateCamToAngle(link.rotationAfterStepAngle);
@@ -318,7 +327,7 @@ export class Viewer {
318327
groupLinks.filter((l) => l !== gl).forEach((l) => l.closeLinks());
319328
},
320329
async (selectedId) => {
321-
let rotateCam = () => {};
330+
let rotateCam = () => { };
322331
var overridePair = groupLink.groupStateRotationOverrides.find(
323332
(p) => p.stateId == selectedId
324333
);

0 commit comments

Comments
 (0)