Merge pull request #200 from kshepherd2013/render_tab_depth_fix

Fix for Render tab showing depth incorrect image
makehumancommunity · Jul 14, 2022 · d7e0c21 · d7e0c21
2 parents 7378f19 + a4345b5
commit d7e0c21
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/makehuman/lib/glmodule.py b/makehuman/lib/glmodule.py
@@ -876,6 +876,7 @@ def renderToBuffer(width, height, productionRender = True):
     # Neutral background color
     oldClearColor = G.clearColor
     G.clearColor = (0.5,0.5,0.5, 1)
+    glEnable(GL_DEPTH_TEST);
 
     # Draw scene as usual
     draw(productionRender)
@@ -967,6 +968,7 @@ def renderAlphaMask(width, height, productionRender = True):
     # Transparent background color
     oldClearColor = G.clearColor
     G.clearColor = (0.5, 0.5, 0.5, 0)
+    glEnable(GL_DEPTH_TEST);
     # Change blend func to accumulate alpha
     glBlendFunc(GL_ONE, GL_ONE)
     # Disable multisampling

diff --git a/makehuman/lib/image_qt.py b/makehuman/lib/image_qt.py
@@ -126,7 +126,7 @@ def resized(img, width, height, filter=0):
         transform = QtCore.Qt.SmoothTransformation
     else:
         transform = QtCore.Qt.FastTransformation
-    qi = qi.scaled(QtCore.QSize(width, height), 
+    qi = qi.scaled(QtCore.QSize(int(width), int(height)), 
                    transformMode=transform)
     return load(qi)
 
diff --git a/makehuman/lib/qtgui.py b/makehuman/lib/qtgui.py
@@ -2186,6 +2186,7 @@ def __init__(self):
         self.workingWidth = None
         self.ratio = 1.0
         self.minratio = 0.1
+        self.mdown = None
 
     def setImage(self, img):
         pixmap = getPixmap(img)
@@ -2247,10 +2248,11 @@ def mouseMoveEvent(self, event):
                                               event.buttons(), event.modifiers()), False)
             self.mdown = event.pos()
         else:
-            self.horizontalScrollBar().setValue(
-                self.horizontalScrollBar().value() + 2*(self.mdown.x() - event.pos().x()))
-            self.verticalScrollBar().setValue(
-                self.verticalScrollBar().value() + 2*(self.mdown.y() - event.pos().y()))
+            if self.mdown is not None:
+                self.horizontalScrollBar().setValue(
+                    self.horizontalScrollBar().value() + 2*(self.mdown.x() - event.pos().x()))
+                self.verticalScrollBar().setValue(
+                    self.verticalScrollBar().value() + 2*(self.mdown.y() - event.pos().y()))
             self.mdown = event.pos()
             self.refreshImage()
 

diff --git a/makehuman/lib/qtui.py b/makehuman/lib/qtui.py
@@ -185,6 +185,7 @@ def __init__(self, parent, app):
         format.setSwapBehavior(QtGui.QSurfaceFormat.DoubleBuffer)
         #if not G.preStartupSettings["noSampleBuffers"]:
         #    format.setSamples(4)
+        format.setSamples(0)
         super(Canvas, self).__init__(parent)
         self.setFormat(format)
         self.create()