History

Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager

Ryan Huffman committed 7 years ago

Commit 93f53cf2 parents 8474960 c95da0a136 files · +5013 −1421Browse files

Showing the changes to interface/src/Application.cpp (1 of 136 files). Show all

Unified · Split

interface/src/Application.cpp+12−8
@@ -209,6 +209,8 @@ · 208 unmodified lines
209209 #include "InterfaceParentFinder.h"
210210 #include "ui/OctreeStatsProvider.h"
211211
212+#include "avatar/GrabManager.h"
213+
212214 #include <GPUIdent.h>
213215 #include <gl/GLHelpers.h>
214216 #include <src/scripting/GooglePolyScriptingInterface.h>
@@ -920,6 +922,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 705 unmodified lines
920922 DependencyManager::set<ResourceRequestObserver>();
921923 DependencyManager::set<Keyboard>();
922924 DependencyManager::set<KeyboardScriptingInterface>();
925+ DependencyManager::set<GrabManager>();
923926 DependencyManager::set<AvatarPackager>();
924927
925928 return previousSessionCrashed;
@@ -1080,6 +1083,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 154 unmodified lines
10801083
10811084 auto nodeList = DependencyManager::get<NodeList>();
10821085 nodeList->startThread();
1086+ nodeList->setFlagTimeForConnectionStep(true);
10831087
10841088 // move the AddressManager to the NodeList thread so that domain resets due to domain changes always occur
10851089 // before we tell MyAvatar to go to a new location in the new domain
@@ -4914,7 +4918,7 @@ void Application::calibrateEyeTracker5Points() { · 3828 unmodified lines
49144918 #endif
49154919
49164920 bool Application::exportEntities(const QString& filename,
4917− const QVector<EntityItemID>& entityIDs,
4921+ const QVector<QUuid>& entityIDs,
49184922 const glm::vec3* givenOffset) {
49194923 QHash<EntityItemID, EntityItemPointer> entities;
49204924
@@ -4989,16 +4993,12 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa · 68 unmodified lines
49894993 glm::vec3 minCorner = center - vec3(scale);
49904994 float cubeSize = scale * 2;
49914995 AACube boundingCube(minCorner, cubeSize);
4992− QVector<EntityItemPointer> entities;
4993− QVector<EntityItemID> ids;
4996+ QVector<QUuid> entities;
49944997 auto entityTree = getEntities()->getTree();
49954998 entityTree->withReadLock([&] {
4996− entityTree->findEntities(boundingCube, entities);
4997− foreach(EntityItemPointer entity, entities) {
4998− ids << entity->getEntityItemID();
4999− }
4999+ entityTree->evalEntitiesInCube(boundingCube, PickFilter(), entities);
50005000 });
5001− return exportEntities(filename, ids, &center);
5001+ return exportEntities(filename, entities, &center);
50025002 }
50035003
50045004 void Application::loadSettings() {
@@ -6091,6 +6091,9 @@ void Application::update(float deltaTime) { · 1086 unmodified lines
60916091 updateThreads(deltaTime); // If running non-threaded, then give the threads some time to process...
60926092 updateDialogs(deltaTime); // update various stats dialogs if present
60936093
6094+ auto grabManager = DependencyManager::get<GrabManager>();
6095+ grabManager->simulateGrabs();
6096+
60946097 QSharedPointer<AvatarManager> avatarManager = DependencyManager::get<AvatarManager>();
60956098
60966099 {
@@ -6694,6 +6697,7 @@ void Application::resetSensors(bool andReload) { · 597 unmodified lines
66946697 DependencyManager::get<DdeFaceTracker>()->reset();
66956698 DependencyManager::get<EyeTracker>()->reset();
66966699 _overlayConductor.centerUI();
6700+ getActiveDisplayPlugin()->resetSensors();
66976701 getMyAvatar()->reset(true, andReload);
66986702 QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "reset", Qt::QueuedConnection);
66996703 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t