Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
b2b299259b

+ 2 - 9
direct/src/actor/Actor.py

@@ -671,15 +671,8 @@ class Actor(PandaObject, NodePath):
             return
             return
         
         
         if mode < 0:
         if mode < 0:
-            # Draw as a decal.  In case people don't have an
-            # up-to-date Panda, we'll fall back on
-            # DirectRenderTransition.
-            
-            try:
-                dt = DecalTransition()
-            except:
-                dt = DirectRenderTransition()
-
+            # Draw as a decal.
+            dt = DecalTransition()
         else:
         else:
             dt = DirectRenderTransition()
             dt = DirectRenderTransition()
 
 

+ 1 - 1
panda/src/cull/cullTraverser.cxx

@@ -252,7 +252,7 @@ setup_initial_bins() {
   GeomBinNormal *default_bin = new GeomBinNormal("default");
   GeomBinNormal *default_bin = new GeomBinNormal("default");
   GeomBinFixed *background = new GeomBinFixed("background");
   GeomBinFixed *background = new GeomBinFixed("background");
   GeomBinFixed *fixed = new GeomBinFixed("fixed");
   GeomBinFixed *fixed = new GeomBinFixed("fixed");
-  background->set_sort(20);
+  background->set_sort(10);
   fixed->set_sort(40);
   fixed->set_sort(40);
 
 
   default_bin->set_traverser(this);
   default_bin->set_traverser(this);

+ 1 - 1
panda/src/cull/geomBinNormal.cxx

@@ -24,7 +24,7 @@ GeomBinNormal(const string &name) :
 {
 {
   GeomBinUnsorted *opaque = new GeomBinUnsorted("opaque");
   GeomBinUnsorted *opaque = new GeomBinUnsorted("opaque");
   GeomBinBackToFront *transparent = new GeomBinBackToFront("transparent");
   GeomBinBackToFront *transparent = new GeomBinBackToFront("transparent");
-  opaque->set_sort(10);
+  opaque->set_sort(20);
   transparent->set_sort(30);
   transparent->set_sort(30);
 
 
   add_sub_bin(opaque);
   add_sub_bin(opaque);

+ 3 - 3
panda/src/doc/howto.control_render_order

@@ -101,8 +101,8 @@ GeomBinFixed.
 The order of all the predefined bins (and their predefined sort
 The order of all the predefined bins (and their predefined sort
 orders) is as follows:
 orders) is as follows:
 
 
-  10 - 'default'    : GeomBinNormal (opaque sub-bin)
-  20 - 'background' : GeomBinFixed
+  10 - 'background' : GeomBinFixed
+  20 - 'default'    : GeomBinNormal (opaque sub-bin)
   30 - 'default'    : GeomBinNormal (transparent sub-bin)
   30 - 'default'    : GeomBinNormal (transparent sub-bin)
   40 - 'fixed'      : GeomBinFixed
   40 - 'fixed'      : GeomBinFixed
 
 
@@ -124,7 +124,7 @@ create an bin called 'shadow' to render shadows in no particular
 order, but before any other transparent objects are rendered, you may
 order, but before any other transparent objects are rendered, you may
 add the line:
 add the line:
 
 
-  cull-bin shadow 15 unsorted
+  cull-bin shadow 25 unsorted
 
 
 The valid bin types are normal, unsorted, state-sorted, fixed, or
 The valid bin types are normal, unsorted, state-sorted, fixed, or
 back-to-front.
 back-to-front.