Various fixes

Author: tomas-soltys

src/fea/doc/RELEASE_NOTES.txt

@@ -8,6 +8,7 @@ Bug fixes:
 
 - Do not display empty "()" in model info box area when no model comment is set
 - Do not allow to accept empty model name when renaming a model or creating a new model
+- Cannot pick hole edges
 
 ------------------------------------------------------------------
 Version 1.1.3

src/fea/src/gl_acion_event.cpp

@@ -85,6 +85,7 @@ void GLActionEvent::setMouseEvent(QMouseEvent *mouseEvent, bool release)
 {
     GLActionEvent::Type prevType = this->getType();
     this->buttons = release ? Qt::NoButton : mouseEvent->buttons();
+    this->keyModifiers = mouseEvent->modifiers();
     GLActionEvent::Type currType = this->getType();
     this->actionChanged = (prevType != currType);
     emit this->changed(currType);

src/fea/src/gl_functions.cpp

@@ -2,6 +2,9 @@
 
 #include <rbl_logger.h>
 
+#include <QOpenGLContext>
+#include <QOpenGLFunctions>
+
 #include "gl_functions.h"
 #include "gl_vertex_buffer.h"
 
@@ -110,6 +113,11 @@ void GLFunctions::normal3f(GLfloat x, GLfloat y, GLfloat z)
     else
     {
         glNormal3f(x, y, z);
+        // Also feed aNormal (location 1) so immediate-mode draws work with the GLSL shader.
+        if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
+        {
+            ctx->functions()->glVertexAttrib3f(1, x, y, z);
+        }
     }
 }
 
@@ -144,6 +152,12 @@ void GLFunctions::color4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a)
     else
     {
         glColor4ub(r, g, b, a);
+        // Also feed aColor (location 2) so immediate-mode draws work with the GLSL shader.
+        if (QOpenGLContext *ctx = QOpenGLContext::currentContext())
+        {
+            ctx->functions()->glVertexAttrib4f(2,
+                r / 255.0f, g / 255.0f, b / 255.0f, a / 255.0f);
+        }
     }
 }
 

src/fea/src/gl_widget.cpp

@@ -464,13 +464,6 @@ void GLWidget::drawModel()
         this->modelDrawTime = modelDrawStopWatch.getMiliSeconds();
     }
 
-    // Release shader — subsequent non-model drawing uses fixed-function pipeline.
-    if (this->mainShaderProgram.isValid())
-    {
-        this->mainShaderProgram.release();
-        GLStateCache::instance().setShaderProgram(nullptr);
-    }
-
     if (this->clippingPlaneEnabled)
     {
         GL_SAFE_CALL(glDisable(GL_CLIP_PLANE0));
@@ -527,14 +520,21 @@ void GLWidget::drawModel()
         gGrid.paint();
     }
 
-    // Draw draw-engine objects
+    // Draw draw-engine objects (shader must still be bound for VBO normal/lighting to work)
     RLogger::trace("Draw engine objects\n");
     const DrawEngine *pDrawEngine = Application::instance()->getSession()->getDrawEngine();
     for (uint i=0;i<pDrawEngine->getNObjects();i++)
     {
         pDrawEngine->getObject(i)->glDraw(this);
     }
 
+    // Release shader — draw-engine objects above need it, everything below uses fixed-function.
+    if (this->mainShaderProgram.isValid())
+    {
+        this->mainShaderProgram.release();
+        GLStateCache::instance().setShaderProgram(nullptr);
+    }
+
     // Draw nodes to move
     if (this->drawMoveNodes)
     {

src/fea/src/pick_list.cpp

@@ -126,7 +126,7 @@ bool PickList::registerItem(const PickItem &pickItem)
     {
         if ((*iter) == pickItem)
         {
-            this->items.erase(iter);
+            iter = this->items.erase(iter);
             itemErased = true;
         }
         else
@@ -208,7 +208,7 @@ void PickList::removeItem(const PickItem &pickItem)
     {
         if ((*iter) == pickItem)
         {
-            this->items.erase(iter);
+            iter = this->items.erase(iter);
         }
         else
         {
@@ -228,7 +228,7 @@ void PickList::removeItems(uint modelID)
     {
         if (iter->getEntityID().getMid() == modelID)
         {
-            this->items.erase(iter);
+            iter = this->items.erase(iter);
         }
         else
         {
@@ -250,6 +250,7 @@ bool PickList::hasItem(const PickItem &pickItem)
         {
             return true;
         }
+        ++iter;
     }
     return false;
 }