Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 23:40:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ctrl-S sound feature added

Browse source
This commit is contained in:
Patrick Manalich 2017-06-01 17:57:18 -07:00
parent 0c71cf4bda
commit a705e722f1
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Application.cpp
View file

@ -1683,6 +1683,9 @@ Application::~Application() {
_physicsEngine->setCharacterController(nullptr); _physicsEngine->setCharacterController(nullptr);
// shutdown render engine
_main3DScene = nullptr;
_renderEngine = nullptr;
// the _shapeManager should have zero references // the _shapeManager should have zero references
_shapeManager.collectGarbage(); _shapeManager.collectGarbage();
assert(_shapeManager.getNumShapes() == 0); assert(_shapeManager.getNumShapes() == 0);
@ -4494,7 +4497,17 @@ void Application::update(float deltaTime) {
getEntities()->getTree()->withWriteLock([&] { getEntities()->getTree()->withWriteLock([&] {
PerformanceTimer perfTimer("handleOutgoingChanges"); PerformanceTimer perfTimer("handleOutgoingChanges");
const VectorOfMotionStates& deactivations = _physicsEngine->getDeactivatedMotionStates();
_entitySimulation->handleDeactivatedMotionStates(deactivations);
getEntities()->getTree()->withWriteLock([&] {
PerformanceTimer perfTimer("handleOutgoingChanges");
const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
_entitySimulation->handleChangedMotionStates(outgoingChanges);
avatarManager->handleChangedMotionStates(outgoingChanges);
});
const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates(); const VectorOfMotionStates& outgoingChanges = _physicsEngine->getChangedMotionStates();
_entitySimulation->handleChangedMotionStates(outgoingChanges); _entitySimulation->handleChangedMotionStates(outgoingChanges);
avatarManager->handleChangedMotionStates(outgoingChanges); avatarManager->handleChangedMotionStates(outgoingChanges);

BIN
scripts/system/assets/sounds/snap.wav
View file

Binary file not shown.

2
scripts/system/snapshot.js
View file

@ -410,7 +410,7 @@ function takeSnapshot() {
Menu.setIsOptionChecked("Overlays", false); Menu.setIsOptionChecked("Overlays", false);
} }
var snapActivateSound = SoundCache.getSound(Script.resolvePath("assets/sounds/snap.wav")); var snapActivateSound = SoundCache.getSound(Script.resolvePath("../../resources/sounds/snap.wav"));
// take snapshot (with no notification) // take snapshot (with no notification)
Script.setTimeout(function () { Script.setTimeout(function () {