From 34183b9ddf54541e84eea4fbad6b2cf902a00dc0 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 4 Aug 2015 12:36:35 -0700 Subject: [PATCH] COmmenting the remove of the glLIneWidth and demoving dead code --- interface/src/avatar/Head.cpp | 1 + interface/src/avatar/SkeletonModel.cpp | 1 + interface/src/ui/ApplicationOverlay.cpp | 1 + interface/src/ui/overlays/Circle3DOverlay.cpp | 4 +++- interface/src/ui/overlays/Grid3DOverlay.cpp | 2 ++ libraries/gpu/src/gpu/GLBackendState.cpp | 3 --- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/interface/src/avatar/Head.cpp b/interface/src/avatar/Head.cpp index e0bb4007a1..06a29e5d82 100644 --- a/interface/src/avatar/Head.cpp +++ b/interface/src/avatar/Head.cpp @@ -397,6 +397,7 @@ void Head::renderLookatVectors(RenderArgs* renderArgs, glm::vec3 leftEyePosition auto& batch = *renderArgs->_batch; auto transform = Transform{}; batch.setModelTransform(transform); + // FIXME: THe line width of 2.0f is not supported anymore, we ll need a workaround auto deferredLighting = DependencyManager::get(); deferredLighting->bindSimpleProgram(batch); diff --git a/interface/src/avatar/SkeletonModel.cpp b/interface/src/avatar/SkeletonModel.cpp index e78679de6d..c516f24fef 100644 --- a/interface/src/avatar/SkeletonModel.cpp +++ b/interface/src/avatar/SkeletonModel.cpp @@ -248,6 +248,7 @@ void SkeletonModel::renderJointConstraints(gpu::Batch& batch, int jointIndex) { const FBXGeometry& geometry = _geometry->getFBXGeometry(); const float BASE_DIRECTION_SIZE = 0.3f; float directionSize = BASE_DIRECTION_SIZE * extractUniformScale(_scale); + // FIXME: THe line width of 3.0f is not supported anymore, we ll need a workaround do { const FBXJoint& joint = geometry.joints.at(jointIndex); diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp index 6af7d64e44..c24ae4ba00 100644 --- a/interface/src/ui/ApplicationOverlay.cpp +++ b/interface/src/ui/ApplicationOverlay.cpp @@ -245,6 +245,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder(RenderArgs* renderAr batch.setModelTransform(Transform()); batch.setViewTransform(Transform()); batch.setResourceTexture(0, DependencyManager::get()->getWhiteTexture()); + // FIXME: THe line width of CONNECTION_STATUS_BORDER_LINE_WIDTH is not supported anymore, we ll need a workaround // TODO animate the disconnect border for some excitement while not connected? //double usecs = usecTimestampNow(); diff --git a/interface/src/ui/overlays/Circle3DOverlay.cpp b/interface/src/ui/overlays/Circle3DOverlay.cpp index 026649c970..588a5077b4 100644 --- a/interface/src/ui/overlays/Circle3DOverlay.cpp +++ b/interface/src/ui/overlays/Circle3DOverlay.cpp @@ -101,7 +101,9 @@ void Circle3DOverlay::render(RenderArgs* args) { Q_ASSERT(args->_batch); auto& batch = *args->_batch; - + + // FIXME: THe line width of _lineWidth is not supported anymore, we ll need a workaround + auto transform = _transform; transform.postScale(glm::vec3(getDimensions(), 1.0f)); batch.setModelTransform(transform); diff --git a/interface/src/ui/overlays/Grid3DOverlay.cpp b/interface/src/ui/overlays/Grid3DOverlay.cpp index 9525dd1776..bfb0d1d9df 100644 --- a/interface/src/ui/overlays/Grid3DOverlay.cpp +++ b/interface/src/ui/overlays/Grid3DOverlay.cpp @@ -84,6 +84,8 @@ void Grid3DOverlay::render(RenderArgs* args) { transform.setTranslation(position); transform.setScale(scale); + // FIXME: THe line width of 4.0f is not supported anymore, we ll need a workaround + batch->setModelTransform(transform); DependencyManager::get()->renderGrid(*batch, MAJOR_GRID_DIVISIONS, MAJOR_GRID_DIVISIONS, gridColor); diff --git a/libraries/gpu/src/gpu/GLBackendState.cpp b/libraries/gpu/src/gpu/GLBackendState.cpp index 9da63501bb..c5cc987fd1 100644 --- a/libraries/gpu/src/gpu/GLBackendState.cpp +++ b/libraries/gpu/src/gpu/GLBackendState.cpp @@ -586,12 +586,9 @@ void GLBackend::do_setStateMultisampleEnable(bool enable) { void GLBackend::do_setStateAntialiasedLineEnable(bool enable) { if (_pipeline._stateCache.antialisedLineEnable != enable) { - // FIXME CORE if (enable) { - // glEnable(GL_POINT_SMOOTH); glEnable(GL_LINE_SMOOTH); } else { - // glDisable(GL_POINT_SMOOTH); glDisable(GL_LINE_SMOOTH); } (void) CHECK_GL_ERROR();