Showing the changes to interface/src/Application.cpp (1 of 58 files). Show all
Unified · Split
| @@ -191,9 +191,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 190 unmodified lines | |||
| 191 | _frameCount(0), | 191 | _frameCount(0), |
| 192 | _fps(60.0f), | 192 | _fps(60.0f), |
| 193 | _justStarted(true), | 193 | _justStarted(true), |
| 194 | #ifdef USE_BULLET_PHYSICS | ||
| 195 | _physicsEngine(glm::vec3(0.0f)), | 194 | _physicsEngine(glm::vec3(0.0f)), |
| 196 | #endif // USE_BULLET_PHYSICS | ||
| 197 | _entities(true, this, this), | 195 | _entities(true, this, this), |
| 198 | _entityCollisionSystem(), | 196 | _entityCollisionSystem(), |
| 199 | _entityClipboardRenderer(false, this, this), | 197 | _entityClipboardRenderer(false, this, this), |
| @@ -1726,12 +1724,10 @@ void Application::init() { · 1526 unmodified lines | |||
| 1726 | // save settings when avatar changes | 1724 | // save settings when avatar changes |
| 1727 | connect(_myAvatar, &MyAvatar::transformChanged, this, &Application::bumpSettings); | 1725 | connect(_myAvatar, &MyAvatar::transformChanged, this, &Application::bumpSettings); |
| 1728 | 1726 | ||
| 1729 | #ifdef USE_BULLET_PHYSICS | ||
| 1730 | EntityTree* tree = _entities.getTree(); | 1727 | EntityTree* tree = _entities.getTree(); |
| 1731 | _physicsEngine.setEntityTree(tree); | 1728 | _physicsEngine.setEntityTree(tree); |
| 1732 | tree->setSimulation(&_physicsEngine); | 1729 | tree->setSimulation(&_physicsEngine); |
| 1733 | _physicsEngine.init(&_entityEditSender); | 1730 | _physicsEngine.init(&_entityEditSender); |
| 1734 | #endif // USE_BULLET_PHYSICS | ||
| 1735 | // make sure our texture cache knows about window size changes | 1731 | // make sure our texture cache knows about window size changes |
| 1736 | DependencyManager::get<TextureCache>()->associateWithWidget(glCanvas.data()); | 1732 | DependencyManager::get<TextureCache>()->associateWithWidget(glCanvas.data()); |
| 1737 | 1733 | ||
| @@ -2042,12 +2038,10 @@ void Application::update(float deltaTime) { · 304 unmodified lines | |||
| 2042 | updateDialogs(deltaTime); // update various stats dialogs if present | 2038 | updateDialogs(deltaTime); // update various stats dialogs if present |
| 2043 | updateCursor(deltaTime); // Handle cursor updates | 2039 | updateCursor(deltaTime); // Handle cursor updates |
| 2044 | 2040 | ||
| 2045 | #ifdef USE_BULLET_PHYSICS | ||
| 2046 | { | 2041 | { |
| 2047 | PerformanceTimer perfTimer("physics"); | 2042 | PerformanceTimer perfTimer("physics"); |
| 2048 | _physicsEngine.stepSimulation(); | 2043 | _physicsEngine.stepSimulation(); |
| 2049 | } | 2044 | } |
| 2050 | #endif // USE_BULLET_PHYSICS | ||
| 2051 | 2045 | ||
| 2052 | if (!_aboutToQuit) { | 2046 | if (!_aboutToQuit) { |
| 2053 | PerformanceTimer perfTimer("entities"); | 2047 | PerformanceTimer perfTimer("entities"); |
| @@ -3685,7 +3679,6 @@ void Application::openUrl(const QUrl& url) { · 1631 unmodified lines | |||
| 3685 | 3679 | ||
| 3686 | void Application::updateMyAvatarTransform() { | 3680 | void Application::updateMyAvatarTransform() { |
| 3687 | bumpSettings(); | 3681 | bumpSettings(); |
| 3688 | #ifdef USE_BULLET_PHYSICS | ||
| 3689 | const float SIMULATION_OFFSET_QUANTIZATION = 16.0f; // meters | 3682 | const float SIMULATION_OFFSET_QUANTIZATION = 16.0f; // meters |
| 3690 | glm::vec3 avatarPosition = _myAvatar->getPosition(); | 3683 | glm::vec3 avatarPosition = _myAvatar->getPosition(); |
| 3691 | glm::vec3 physicsWorldOffset = _physicsEngine.getOriginOffset(); | 3684 | glm::vec3 physicsWorldOffset = _physicsEngine.getOriginOffset(); |
| @@ -3699,7 +3692,6 @@ void Application::updateMyAvatarTransform() { · 7 unmodified lines | |||
| 3699 | // TODO: Andrew to replace this with method that actually moves existing object positions in PhysicsEngine | 3692 | // TODO: Andrew to replace this with method that actually moves existing object positions in PhysicsEngine |
| 3700 | _physicsEngine.setOriginOffset(newOriginOffset); | 3693 | _physicsEngine.setOriginOffset(newOriginOffset); |
| 3701 | } | 3694 | } |
| 3702 | #endif // USE_BULLET_PHYSICS | ||
| 3703 | } | 3695 | } |
| 3704 | 3696 | ||
| 3705 | void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject) { | 3697 | void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject) { |