From b75bd80de7e2eb22ff04c810a4de3efb0afcadd5 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 4 Jun 2013 17:54:48 -0700 Subject: [PATCH] fix build busters --- interface/src/Application.cpp | 11 ++---- interface/src/Application.h | 65 ++--------------------------------- interface/src/Avatar.cpp | 10 ++---- interface/src/Avatar.h | 4 +-- 4 files changed, 7 insertions(+), 83 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index f4b63acc5a..ae233e8d8c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -162,8 +162,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : _packetCount(0), _packetsPerSecond(0), _bytesPerSecond(0), - _bytesCount(0), - _settings("HighFidelity", "Interface") + _bytesCount(0) { _applicationStartupTime = startup_time; _window->setWindowTitle("Interface"); @@ -975,7 +974,7 @@ void Application::terminate() { if (_autosave) { saveSettings(); - _settings.sync(); + _settings->sync(); } if (_enableNetworkThread) { @@ -1166,8 +1165,6 @@ void Application::chooseVoxelPaintColor() { _window->activateWindow(); } -<<<<<<< HEAD -======= const int MAXIMUM_EDIT_VOXEL_MESSAGE_SIZE = 1500; struct SendVoxelsOperationArgs { unsigned char* newBaseOctCode; @@ -1331,7 +1328,6 @@ void Application::pasteVoxels() { } } ->>>>>>> 82c1ee2062577f614cfde096f08adfc9e83e4f0f void Application::initMenu() { QMenuBar* menuBar = new QMenuBar(); _window->setMenuBar(menuBar); @@ -1450,7 +1446,6 @@ void Application::initMenu() { debugMenu->addAction("Wants Res-In", this, SLOT(setWantsResIn(bool)))->setCheckable(true); debugMenu->addAction("Wants Monochrome", this, SLOT(setWantsMonochrome(bool)))->setCheckable(true); debugMenu->addAction("Wants View Delta Sending", this, SLOT(setWantsDelta(bool)))->setCheckable(true); -<<<<<<< HEAD QMenu* settingsMenu = menuBar->addMenu("Settings"); (_settingsAutosave = settingsMenu->addAction("Autosave", this, SLOT(setAutosave(bool))))->setCheckable(true); @@ -1459,11 +1454,9 @@ void Application::initMenu() { settingsMenu->addAction("Save settings", this, SLOT(saveSettings())); settingsMenu->addAction("Import settings", this, SLOT(importSettings())); settingsMenu->addAction("Export settings", this, SLOT(exportSettings())); -======= _networkAccessManager = new QNetworkAccessManager(this); _settings = new QSettings("High Fidelity", "Interface", this); ->>>>>>> 82c1ee2062577f614cfde096f08adfc9e83e4f0f } void Application::updateFrustumRenderModeAction() { diff --git a/interface/src/Application.h b/interface/src/Application.h index df30199e25..446efce8a9 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -71,66 +71,12 @@ public: Camera* getCamera() { return &_myCamera; } ViewFrustum* getViewFrustum() { return &_viewFrustum; } VoxelSystem* getVoxels() { return &_voxels; } - QSettings* getSettings() { return &_settings; } + QSettings* getSettings() { return _settings; } Environment* getEnvironment() { return &_environment; } bool shouldEchoAudio() { return _echoAudioMode->isChecked(); } -<<<<<<< HEAD -======= QNetworkAccessManager* getNetworkAccessManager() { return _networkAccessManager; } - /*! - @fn getSettingBool - @brief A function for getting boolean settings from the settings file. - @param settingName The desired setting to get the value for. - @param boolSetting The referenced variable where the setting will be stored. - @param defaultSetting The default setting to assign to boolSetting if this function fails to find the appropriate setting. Defaults to false. - */ - bool getSetting(const char* setting, bool &value, const bool defaultSetting = false) const; - - /*! - @fn getSettingFloat - @brief A function for getting float settings from the settings file. - @param settingName The desired setting to get the value for. - @param floatSetting The referenced variable where the setting will be stored. - @param defaultSetting The default setting to assign to boolSetting if this function fails to find the appropriate setting. Defaults to 0.0f. - */ - bool getSetting(const char* setting, float &value, const float defaultSetting = 0.0f) const; - - /*! - @fn getSettingVec3 - @brief A function for getting boolean settings from the settings file. - @param settingName The desired setting to get the value for. - @param vecSetting The referenced variable where the setting will be stored. - @param defaultSetting The default setting to assign to boolSetting if this function fails to find the appropriate setting. Defaults to <0.0f, 0.0f, 0.0f> - */ - bool getSetting(const char* setting, glm::vec3 &value, const glm::vec3& defaultSetting = glm::vec3(0.0f, 0.0f, 0.0f)) const; - - /*! - @fn setSettingBool - @brief A function for setting boolean setting values when saving the settings file. - @param settingName The desired setting to populate a value for. - @param boolSetting The value to set. - */ - void setSetting(const char* setting, const bool value); - - /*! - @fn setSettingFloat - @brief A function for setting boolean setting values when saving the settings file. - @param settingName The desired setting to populate a value for. - @param floatSetting The value to set. - */ - void setSetting(const char* setting, const float value); - - /*! - @fn setSettingVec3 - @brief A function for setting boolean setting values when saving the settings file. - @param settingName The desired setting to populate a value for. - @param vecSetting The value to set. - */ - void setSetting(const char* setting, const glm::vec3& value); ->>>>>>> 82c1ee2062577f614cfde096f08adfc9e83e4f0f - private slots: void timer(); @@ -167,22 +113,16 @@ private slots: void decreaseVoxelSize(); void increaseVoxelSize(); void chooseVoxelPaintColor(); -<<<<<<< HEAD - void setAutosave(bool wantsAutosave); void loadSettings(QSettings* set = NULL); void saveSettings(QSettings* set = NULL); void importSettings(); void exportSettings(); - -======= void exportVoxels(); void importVoxels(); void cutVoxels(); void copyVoxels(); void pasteVoxels(); - ->>>>>>> 82c1ee2062577f614cfde096f08adfc9e83e4f0f private: static bool sendVoxelsOperation(VoxelNode* node, void* extraData); @@ -260,7 +200,6 @@ private: QAction* _settingsAutosave; // Whether settings are saved automatically QNetworkAccessManager* _networkAccessManager; - QSettings* _settings; SerialInterface _serialPort; bool _displayLevels; @@ -353,7 +292,7 @@ private: int _bytesPerSecond; int _bytesCount; - QSettings _settings; // Contain Menu settings and Avatar data + QSettings* _settings; // Contain Menu settings and Avatar data bool _autosave; // True if the autosave is on. }; diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index cff3c718e1..49b83dd670 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -1252,7 +1252,6 @@ void Avatar::setHeadFromGyros(glm::vec3* eulerAngles, glm::vec3* angularVelocity } } -<<<<<<< HEAD void Avatar::loadData(QSettings* set) { set->beginGroup("Avatar"); @@ -1265,18 +1264,13 @@ void Avatar::loadData(QSettings* set) { _position.z = set->value("position_z", _position.z).toFloat(); set->endGroup(); -======= +} + void Avatar::getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, glm::quat& rotation) const { position = _bodyBall[jointID].position; rotation = _bodyBall[jointID].rotation; } -void Avatar::writeAvatarDataToFile() { - Application::getInstance()->setSetting("avatarPos", _position); - Application::getInstance()->setSetting("avatarRotation", glm::vec3(_bodyYaw, _bodyPitch, _bodyRoll)); ->>>>>>> 82c1ee2062577f614cfde096f08adfc9e83e4f0f -} - void Avatar::saveData(QSettings* set) { set->beginGroup("Avatar"); diff --git a/interface/src/Avatar.h b/interface/src/Avatar.h index 58fe7a34a7..73ab3ddaba 100644 --- a/interface/src/Avatar.h +++ b/interface/src/Avatar.h @@ -131,18 +131,16 @@ public: void addThrust(glm::vec3 newThrust) { _thrust += newThrust; }; glm::vec3 getThrust() { return _thrust; }; -<<<<<<< HEAD // get/set avatar data void saveData(QSettings* set); void loadData(QSettings* set); -======= + // Get the position/rotation of a single body ball void getBodyBallTransform(AvatarJointID jointID, glm::vec3& position, glm::quat& rotation) const; //read/write avatar data void writeAvatarDataToFile(); void readAvatarDataFromFile(); ->>>>>>> 82c1ee2062577f614cfde096f08adfc9e83e4f0f private: // privatize copy constructor and assignment operator to avoid copying