History

Merge branch 'master' into offscreen

Brad Davis committed 11 years ago

Commit ce6b7e72 parents 36ca913 d72bb7156 files · +2394 −907Browse files

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

Unified · Split

interface/src/Application.cpp+27−50
@@ -35,7 +35,6 @@ · 34 unmodified lines
3535 #include <QMouseEvent>
3636 #include <QNetworkReply>
3737 #include <QNetworkDiskCache>
38−#include <QOpenGLFramebufferObject>
3938 #include <QObject>
4039 #include <QWheelEvent>
4140 #include <QScreen>
@@ -841,7 +840,7 @@ void Application::paintGL() { · 799 unmodified lines
841840 DependencyManager::get<GlowEffect>()->prepare();
842841
843842 // Viewport is assigned to the size of the framebuffer
844− QSize size = DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->size();
843+ QSize size = DependencyManager::get<TextureCache>()->getFrameBufferSize();
845844 glViewport(0, 0, size.width(), size.height());
846845
847846 glMatrixMode(GL_MODELVIEW);
@@ -2731,8 +2730,9 @@ void Application::updateShadowMap() { · 1883 unmodified lines
27312730 activeRenderingThread = QThread::currentThread();
27322731
27332732 PerformanceTimer perfTimer("shadowMap");
2734− QOpenGLFramebufferObject* fbo = DependencyManager::get<TextureCache>()->getShadowFramebufferObject();
2735− fbo->bind();
2733+ auto shadowFramebuffer = DependencyManager::get<TextureCache>()->getShadowFramebuffer();
2734+ glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(shadowFramebuffer));
2735+
27362736 glEnable(GL_DEPTH_TEST);
27372737 glClear(GL_DEPTH_BUFFER_BIT);
27382738
@@ -2748,16 +2748,18 @@ void Application::updateShadowMap() { · 9 unmodified lines
27482748 loadViewFrustum(_myCamera, _viewFrustum);
27492749
27502750 int matrixCount = 1;
2751− int targetSize = fbo->width();
2751+ //int targetSize = fbo->width();
2752+ int sourceSize = shadowFramebuffer->getWidth();
2753+ int targetSize = shadowFramebuffer->getWidth();
27522754 float targetScale = 1.0f;
27532755 if (Menu::getInstance()->isOptionChecked(MenuOption::CascadedShadows)) {
27542756 matrixCount = CASCADED_SHADOW_MATRIX_COUNT;
2755− targetSize = fbo->width() / 2;
2757+ targetSize = sourceSize / 2;
27562758 targetScale = 0.5f;
27572759 }
27582760 for (int i = 0; i < matrixCount; i++) {
27592761 const glm::vec2& coord = MAP_COORDS[i];
2760− glViewport(coord.s * fbo->width(), coord.t * fbo->height(), targetSize, targetSize);
2762+ glViewport(coord.s * sourceSize, coord.t * sourceSize, targetSize, targetSize);
27612763
27622764 // if simple shadow then since the resolution is twice as much as with cascaded, cover 2 regions with the map, not just one
27632765 int regionIncrement = (matrixCount == 1 ? 2 : 1);
@@ -2880,7 +2882,7 @@ void Application::updateShadowMap() { · 116 unmodified lines
28802882 glMatrixMode(GL_MODELVIEW);
28812883 }
28822884
2883− fbo->release();
2885+ // fbo->release();
28842886
28852887 glViewport(0, 0, _glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
28862888 activeRenderingThread = nullptr;
@@ -2926,7 +2928,8 @@ PickRay Application::computePickRay(float x, float y) { · 39 unmodified lines
29262928 }
29272929
29282930 QImage Application::renderAvatarBillboard() {
2929− DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->bind();
2931+ auto primaryFramebuffer = DependencyManager::get<TextureCache>()->getPrimaryFramebuffer();
2932+ glBindFramebuffer(GL_FRAMEBUFFER, gpu::GLBackend::getFramebufferID(primaryFramebuffer));
29302933
29312934 // the "glow" here causes an alpha of one
29322935 Glower glower;
@@ -2939,7 +2942,7 @@ QImage Application::renderAvatarBillboard() { · 6 unmodified lines
29392942 QImage image(BILLBOARD_SIZE, BILLBOARD_SIZE, QImage::Format_ARGB32);
29402943 glReadPixels(0, 0, BILLBOARD_SIZE, BILLBOARD_SIZE, GL_BGRA, GL_UNSIGNED_BYTE, image.bits());
29412944
2942− DependencyManager::get<TextureCache>()->getPrimaryFramebufferObject()->release();
2945+ glBindFramebuffer(GL_FRAMEBUFFER, 0);
29432946
29442947 return image;
29452948 }
@@ -3808,17 +3811,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 862 unmodified lines
38083811 }
38093812
38103813 // Download the FST file, to attempt to determine its model type
3811− QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
3812− QNetworkRequest networkRequest = QNetworkRequest(url);
3813− networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
3814− QNetworkReply* reply = networkAccessManager.get(networkRequest);
3815− qCDebug(interfaceapp) << "Downloading avatar file at " << url;
3816− QEventLoop loop;
3817− QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
3818− loop.exec();
3819− QByteArray fstContents = reply->readAll();
3820− delete reply;
3821− QVariantHash fstMapping = FSTReader::readMapping(fstContents);
3814+ QVariantHash fstMapping = FSTReader::downloadMapping(url);
38223815
38233816 FSTReader::ModelType modelType = FSTReader::predictModelType(fstMapping);
38243817
@@ -3829,26 +3822,27 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 4 unmodified lines
38293822 QPushButton* bodyButton = NULL;
38303823 QPushButton* bodyAndHeadButton = NULL;
38313824
3825+ QString modelName = fstMapping["name"].toString();
38323826 QString message;
38333827 QString typeInfo;
38343828 switch (modelType) {
38353829 case FSTReader::HEAD_MODEL:
3836− message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for your avatar head?");
3830+ message = QString("Would you like to use '") + modelName + QString("' for your avatar head?");
38373831 headButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
38383832 break;
38393833
38403834 case FSTReader::BODY_ONLY_MODEL:
3841− message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for your avatar body?");
3835+ message = QString("Would you like to use '") + modelName + QString("' for your avatar body?");
38423836 bodyButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
38433837 break;
38443838
38453839 case FSTReader::HEAD_AND_BODY_MODEL:
3846− message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for your avatar?");
3840+ message = QString("Would you like to use '") + modelName + QString("' for your avatar?");
38473841 bodyAndHeadButton = msgBox.addButton(tr("Yes"), QMessageBox::ActionRole);
38483842 break;
38493843
38503844 default:
3851− message = QString("Would you like to use '") + fstMapping["name"].toString() + QString("' for some part of your avatar head?");
3845+ message = QString("Would you like to use '") + modelName + QString("' for some part of your avatar head?");
38523846 headButton = msgBox.addButton(tr("Use for Head"), QMessageBox::ActionRole);
38533847 bodyButton = msgBox.addButton(tr("Use for Body"), QMessageBox::ActionRole);
38543848 bodyAndHeadButton = msgBox.addButton(tr("Use for Body and Head"), QMessageBox::ActionRole);
@@ -3861,34 +3855,18 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 6 unmodified lines
38613855 msgBox.exec();
38623856
38633857 if (msgBox.clickedButton() == headButton) {
3864− qCDebug(interfaceapp) << "Chose to use for head: " << url;
3865− _myAvatar->setFaceModelURL(url);
3866− UserActivityLogger::getInstance().changedModel("head", url);
3867− _myAvatar->sendIdentityPacket();
3868− emit faceURLChanged(url);
3858+ _myAvatar->useHeadURL(url, modelName);
3859+ emit headURLChanged(url, modelName);
38693860 } else if (msgBox.clickedButton() == bodyButton) {
3870− qCDebug(interfaceapp) << "Chose to use for body: " << url;
3871− _myAvatar->setSkeletonModelURL(url);
3872− // if the head is empty, reset it to the default head.
3873− if (_myAvatar->getFaceModelURLString().isEmpty()) {
3874− _myAvatar->setFaceModelURL(DEFAULT_HEAD_MODEL_URL);
3875− emit faceURLChanged(DEFAULT_HEAD_MODEL_URL.toString());
3876− UserActivityLogger::getInstance().changedModel("head", DEFAULT_HEAD_MODEL_URL.toString());
3877− }
3878− UserActivityLogger::getInstance().changedModel("skeleton", url);
3879− _myAvatar->sendIdentityPacket();
3880− emit skeletonURLChanged(url);
3861+ _myAvatar->useBodyURL(url, modelName);
3862+ emit bodyURLChanged(url, modelName);
38813863 } else if (msgBox.clickedButton() == bodyAndHeadButton) {
3882− qCDebug(interfaceapp) << "Chose to use for body + head: " << url;
3883− _myAvatar->setFaceModelURL(QString());
3884− _myAvatar->setSkeletonModelURL(url);
3885− UserActivityLogger::getInstance().changedModel("skeleton", url);
3886− _myAvatar->sendIdentityPacket();
3887− emit faceURLChanged(QString());
3888− emit skeletonURLChanged(url);
3864+ _myAvatar->useFullAvatarURL(url, modelName);
3865+ emit fullAvatarURLChanged(url, modelName);
38893866 } else {
38903867 qCDebug(interfaceapp) << "Declined to use the avatar: " << url;
38913868 }
3869+
38923870 return true;
38933871 }
38943872
@@ -4400,8 +4378,7 @@ void Application::checkSkeleton() { · 505 unmodified lines
44004378 msgBox.setIcon(QMessageBox::Warning);
44014379 msgBox.exec();
44024380
4403− _myAvatar->setSkeletonModelURL(DEFAULT_BODY_MODEL_URL);
4404− _myAvatar->sendIdentityPacket();
4381+ _myAvatar->useBodyURL(DEFAULT_BODY_MODEL_URL, "Default");
44054382 } else {
44064383 _myAvatar->updateCharacterController();
44074384 _physicsEngine.setCharacterController(_myAvatar->getCharacterController());

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