Changeset 4495

Timestamp:

Jun 18, 2020 12:03:52 PM (3 years ago)

Author:

vondreele

Message:

Improve lighting for unit cell box & view point cross

File:

• trunk/GSASIIplot.py (modified) (7 diffs)

trunk/GSASIIplot.py

@@ -8442 +8442 @@
         GL.glEnable(GL.GL_LIGHT0)
         GL.glLightModeli(GL.GL_LIGHT_MODEL_TWO_SIDE,0)
-        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[.1,.1,.1,1])
-        GL.glLightfv(GL.GL_LIGHT0,GL.GL_DIFFUSE,[.8,.8,.8,1])
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[.2,.2,.2,1])
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_DIFFUSE,[.7,.7,.7,1])
 #        glLightfv(GL_LIGHT0,GL_SPECULAR,[1,1,1,1])
 #        glLightfv(GL_LIGHT0,GL_POSITION,[0,0,1,1])
@@ -8611 +8611 @@
 
     def RenderBox():
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[.4,.4,.4,1])
         GL.glEnable(GL.GL_COLOR_MATERIAL)
         GL.glLineWidth(2)
@@ -8626 +8627 @@
         GL.glDisable(GL.GL_BLEND)
         GL.glDisable(GL.GL_COLOR_MATERIAL)
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[.2,.2,.2,1])
         
     def RenderUnitVectors(x,y,z):
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[.7,.7,.7,1])
         GL.glEnable(GL.GL_COLOR_MATERIAL)
         GL.glLineWidth(2)
@@ -8647 +8650 @@
         GL.glDisable(GL.GL_BLEND)
         GL.glDisable(GL.GL_COLOR_MATERIAL)
+        GL.glLightfv(GL.GL_LIGHT0,GL.GL_AMBIENT,[.2,.2,.2,1])
         
     def RenderPlane(plane,color):
@@ -8908 +8912 @@
                             
     def Draw(caller='',Fade=[]):
-#useful debug?        
-#        if caller:
-#            print (caller,generalData['Name'])
-#    Bob: why not use a traceback? See GSASIIobj.HowDidIgetHere()
-# end of useful debug
         vdWRadii = generalData['vdWRadii']
         mapData = generalData['Map']
@@ -8988 +8987 @@
         GL.glTranslate(-Tx,-Ty,-Tz)
         drawingData['modelView'] = GL.glGetDoublev(GL.GL_MODELVIEW_MATRIX)
+        if drawingData['unitCellBox']:
+            RenderBox()
+            if drawingData['Plane'][1]:
+                H,phase,stack,phase,color = drawingData['Plane']
+                Planes = G2lat.PlaneIntercepts(Amat,H,phase,stack)
+                for plane in Planes:
+                    RenderPlane(plane,color)
         if drawingData['showABC']:
             x,y,z = drawingData['viewPoint'][0]
@@ -9214 +9220 @@
                 Backbone = Backbones[chain]
                 RenderBackbone(Backbone,BackboneColor,bondR)
-        if drawingData['unitCellBox']:
-            RenderBox()
-            if drawingData['Plane'][1]:
-                H,phase,stack,phase,color = drawingData['Plane']
-                Planes = G2lat.PlaneIntercepts(Amat,H,phase,stack)
-                for plane in Planes:
-                    RenderPlane(plane,color)
         if drawingData.get('showSlice',False):
             global contourSet,Zslice