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

Merge pull request #3683 from birarda/lobby

Browse source 
fix for location naming break after AddressManager changes
This commit is contained in:
Brad Hefta-Gaub 2014-10-28 17:58:34 -07:00
commit 7ecc0ccb30
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Menu.cpp
View file

@ -1266,7 +1266,6 @@ void Menu::changeVSync() {
} }
void Menu::changeRenderTargetFramerate(QAction* action) { void Menu::changeRenderTargetFramerate(QAction* action) {
bool vsynOn = Application::getInstance()->isVSyncOn(); bool vsynOn = Application::getInstance()->isVSyncOn();
unsigned int framerate = Application::getInstance()->getRenderTargetFramerate();
QString text = action->text(); QString text = action->text();
if (text == MenuOption::RenderTargetFramerateUnlimited) { if (text == MenuOption::RenderTargetFramerateUnlimited) {
@ -1315,7 +1314,7 @@ void Menu::displayNameLocationResponse(const QString& errorString) {
void Menu::toggleLocationList() { void Menu::toggleLocationList() {
if (!_userLocationsDialog) { if (!_userLocationsDialog) {
JavascriptObjectMap locationObjectMap; JavascriptObjectMap locationObjectMap;
locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance()); locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
_userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap); _userLocationsDialog = DataWebDialog::dialogForPath("/user/locations", locationObjectMap);
} }
@ -1359,7 +1358,7 @@ void Menu::nameLocation() {
if (!_newLocationDialog) { if (!_newLocationDialog) {
JavascriptObjectMap locationObjectMap; JavascriptObjectMap locationObjectMap;
locationObjectMap.insert("InterfaceLocation", LocationScriptingInterface::getInstance()); locationObjectMap.insert("InterfaceLocation", &AddressManager::getInstance());
_newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap); _newLocationDialog = DataWebDialog::dialogForPath("/user/locations/new", locationObjectMap);
} }

2
interface/src/gpu/Batch.cpp
View file

@ -111,6 +111,8 @@ void Batch::runCommand(Command com, uint32 offset) {
CASE_COMMAND(glColor4f); CASE_COMMAND(glColor4f);
CASE_COMMAND(glMaterialf); CASE_COMMAND(glMaterialf);
CASE_COMMAND(glMaterialfv); CASE_COMMAND(glMaterialfv);
default:
break;
} }
} }

3
interface/src/renderer/Model.cpp
View file

@ -1737,7 +1737,8 @@ int Model::renderMeshes(gpu::Batch& batch, RenderMode mode, bool translucent, fl
mesh.texCoords.size() * sizeof(glm::vec2) + mesh.texCoords.size() * sizeof(glm::vec2) +
(mesh.blendshapes.isEmpty() ? vertexCount * 2 * sizeof(glm::vec3) : 0); (mesh.blendshapes.isEmpty() ? vertexCount * 2 * sizeof(glm::vec3) : 0);
//skinProgram->setAttributeBuffer(skinLocations->clusterIndices, GL_FLOAT, offset, 4); //skinProgram->setAttributeBuffer(skinLocations->clusterIndices, GL_FLOAT, offset, 4);
GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0, (const void*) offset); GLBATCH(glVertexAttribPointer)(skinLocations->clusterIndices, 4, GL_FLOAT, GL_TRUE, 0,
reinterpret_cast<const void*>(offset));
//skinProgram->setAttributeBuffer(skinLocations->clusterWeights, GL_FLOAT, //skinProgram->setAttributeBuffer(skinLocations->clusterWeights, GL_FLOAT,
// offset + vertexCount * sizeof(glm::vec4), 4); // offset + vertexCount * sizeof(glm::vec4), 4);
GLBATCH(glVertexAttribPointer)(skinLocations->clusterWeights, 4, GL_FLOAT, GL_TRUE, 0, (const void*) (offset + vertexCount * sizeof(glm::vec4))); GLBATCH(glVertexAttribPointer)(skinLocations->clusterWeights, 4, GL_FLOAT, GL_TRUE, 0, (const void*) (offset + vertexCount * sizeof(glm::vec4)));

6
libraries/networking/src/AddressManager.cpp
View file

@ -15,6 +15,7 @@
#include <qstringlist.h> #include <qstringlist.h>
#include <GLMHelpers.h> #include <GLMHelpers.h>
#include <UUID.h>
#include "NodeList.h" #include "NodeList.h"
@ -71,6 +72,11 @@ const QString AddressManager::currentPath(bool withOrientation) const {
} }
} }
QString AddressManager::getDomainID() const {
const QUuid& domainID = NodeList::getInstance()->getDomainHandler().getUUID();
return domainID.isNull() ? "" : uuidStringWithoutCurlyBraces(domainID);
}
const JSONCallbackParameters& AddressManager::apiCallbackParameters() { const JSONCallbackParameters& AddressManager::apiCallbackParameters() {
static bool hasSetupParameters = false; static bool hasSetupParameters = false;
static JSONCallbackParameters callbackParams; static JSONCallbackParameters callbackParams;

2
libraries/networking/src/AddressManager.h
View file

@ -31,6 +31,7 @@ class AddressManager : public QObject {
Q_PROPERTY(QString protocol READ getProtocol) Q_PROPERTY(QString protocol READ getProtocol)
Q_PROPERTY(QString hostname READ getCurrentDomain) Q_PROPERTY(QString hostname READ getCurrentDomain)
Q_PROPERTY(QString pathname READ currentPath) Q_PROPERTY(QString pathname READ currentPath)
Q_PROPERTY(QString domainID READ getDomainID)
public: public:
static AddressManager& getInstance(); static AddressManager& getInstance();
@ -41,6 +42,7 @@ public:
const QString currentPath(bool withOrientation = true) const; const QString currentPath(bool withOrientation = true) const;
const QString& getCurrentDomain() const { return _currentDomain; } const QString& getCurrentDomain() const { return _currentDomain; }
QString getDomainID() const;
void attemptPlaceNameLookup(const QString& lookupString); void attemptPlaceNameLookup(const QString& lookupString);