Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback

Browse source 
Removed json callback
This commit is contained in:
Brad Hefta-Gaub 2014-07-02 21:45:19 -07:00
commit 1b29b7c120
4 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/Application.cpp
View file

@ -399,18 +399,19 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
} }
Application::~Application() { Application::~Application() {
qInstallMessageHandler(NULL);
saveSettings();
storeSizeAndPosition();
saveScripts();
int DELAY_TIME = 1000; int DELAY_TIME = 1000;
UserActivityLogger::getInstance().close(DELAY_TIME); UserActivityLogger::getInstance().close(DELAY_TIME);
qInstallMessageHandler(NULL);
// make sure we don't call the idle timer any more // make sure we don't call the idle timer any more
delete idleTimer; delete idleTimer;
_sharedVoxelSystem.changeTree(new VoxelTree); _sharedVoxelSystem.changeTree(new VoxelTree);
saveSettings();
delete _voxelImporter; delete _voxelImporter;
// let the avatar mixer know we're out // let the avatar mixer know we're out
@ -433,8 +434,6 @@ Application::~Application() {
_particleEditSender.terminate(); _particleEditSender.terminate();
_modelEditSender.terminate(); _modelEditSender.terminate();
storeSizeAndPosition();
saveScripts();
VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown VoxelTreeElement::removeDeleteHook(&_voxels); // we don't need to do this processing on shutdown
Menu::getInstance()->deleteLater(); Menu::getInstance()->deleteLater();

2
interface/src/ScriptsModel.cpp
View file

@ -31,8 +31,6 @@ static const QString IS_TRUNCATED_NAME = "IsTruncated";
static const QString CONTAINER_NAME = "Contents"; static const QString CONTAINER_NAME = "Contents";
static const QString KEY_NAME = "Key"; static const QString KEY_NAME = "Key";
static const int SCRIPT_PATH = Qt::UserRole;
ScriptItem::ScriptItem(const QString& filename, const QString& fullPath) : ScriptItem::ScriptItem(const QString& filename, const QString& fullPath) :
_filename(filename), _filename(filename),
_fullPath(fullPath) { _fullPath(fullPath) {

9
libraries/networking/src/UserActivityLogger.cpp
View file

@ -83,17 +83,10 @@ void UserActivityLogger::close(int delayTime) {
// In order to get the end of the session, we need to give the account manager enough time to send the packet. // In order to get the end of the session, we need to give the account manager enough time to send the packet.
QEventLoop loop; QEventLoop loop;
// Here we connect the callbacks to stop the event loop
JSONCallbackParameters params;
params.jsonCallbackReceiver = &loop;
params.errorCallbackReceiver = &loop;
params.jsonCallbackMethod = "quit";
params.errorCallbackMethod = "quit";
// In case something goes wrong, we also setup a timer so that the delai is not greater than delayTime
QTimer timer; QTimer timer;
connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit); connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
// Now we can log it // Now we can log it
logAction(ACTION_NAME, QJsonObject(), params); logAction(ACTION_NAME, QJsonObject());
timer.start(delayTime); timer.start(delayTime);
loop.exec(); loop.exec();
} }

1
libraries/particles/src/ParticleCollisionSystem.cpp
View file

@ -183,7 +183,6 @@ void ParticleCollisionSystem::updateCollisionWithParticles(Particle* particleA)
// MIN_VALID_SPEED is obtained by computing speed gained at one gravity after the shortest expected frame // MIN_VALID_SPEED is obtained by computing speed gained at one gravity after the shortest expected frame
const float MIN_EXPECTED_FRAME_PERIOD = 0.0167f; // 1/60th of a second const float MIN_EXPECTED_FRAME_PERIOD = 0.0167f; // 1/60th of a second
const float HALTING_SPEED = 9.8 * MIN_EXPECTED_FRAME_PERIOD / (float)(TREE_SCALE);
void ParticleCollisionSystem::updateCollisionWithAvatars(Particle* particle) { void ParticleCollisionSystem::updateCollisionWithAvatars(Particle* particle) {
// particles that are in hand, don't collide with avatars // particles that are in hand, don't collide with avatars