PYMOL-3504 ray_interior_color atomic

Use current primitive color for ray interior coloring with `set ray_interior_color, atomic`. Only supported in ray tracing. Closes #120
schrodinger · Aug 6, 2020 · 8f5c06b · 8f5c06b
1 parent 1e69c53
commit 8f5c06b
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/layer1/Ray.cpp b/layer1/Ray.cpp
@@ -3811,10 +3811,13 @@ int RayTraceThread(CRayThreadInfo * T)
                   RayReflectAndTexture(I, &r1, perspective);
 
                 dotgle = -r1.dotgle;
-                if((interior_color < 0) && (interior_color > cColorExtCutoff)) {
-                  copy3f(r1.prim->ic, fc);
-                } else {
+                if (interior_color >= 0 || interior_color <= cColorExtCutoff) {
                   copy3f(inter, fc);
+                } else if (interior_color == cColorAtomic) {
+                  // Affects spheres+cylinders, but not surfaces+cartoon.
+                  copy3f(r1.prim->c1, fc);
+                } else {
+                  copy3f(r1.prim->ic, fc);
                 }
               } else {
                 if(!perspective)
@@ -3945,10 +3948,14 @@ int RayTraceThread(CRayThreadInfo * T)
                     }
 
                     dotgle = -r1.dotgle;
-                    if((interior_color < 0) && (interior_color > cColorExtCutoff)) {
-                      copy3f(r1.prim->ic, fc);
-                    } else {
+                    if (interior_color >= 0 ||
+                        interior_color <= cColorExtCutoff) {
                       copy3f(inter, fc);
+                    } else if (interior_color == cColorAtomic) {
+                      // Affects surfaces+cartoon, but not spheres+cylinders.
+                      copy3f(r1.prim->c1, fc);
+                    } else {
+                      copy3f(r1.prim->ic, fc);
                     }
                   }
                 }