Browse Source

*** empty log message ***

David Rose 25 years ago
parent
commit
a122bab979

+ 0 - 2
panda/src/dxgsg/dxGraphicsStateGuardian.cxx

@@ -1134,8 +1134,6 @@ draw_linestrip(const GeomLinestrip* geom) {
 	    p_colr = D3DRGBA(p_color[0], p_color[1], p_color[2], p_color[3]);
 	    p_colr = D3DRGBA(p_color[0], p_color[1], p_color[2], p_color[3]);
 	    }
 	    }
 
 
-	size_t vertex_size = draw_prim_setup(geom);
-
     int nVerts = *(plen++);
     int nVerts = *(plen++);
     nassertv(nVerts >= 2);
     nassertv(nVerts >= 2);
 
 

+ 1 - 0
panda/src/express/Sources.pp

@@ -3,6 +3,7 @@
 
 
 #begin lib_target
 #begin lib_target
   #define TARGET express
   #define TARGET express
+  #define USE_NSPR yes
   
   
   #define SOURCES							\
   #define SOURCES							\
     bigEndian.I bigEndian.cxx bigEndian.h buffer.I buffer.cxx buffer.h	\
     bigEndian.I bigEndian.cxx bigEndian.h buffer.I buffer.cxx buffer.h	\

+ 1 - 0
panda/src/ipc/Sources.pp

@@ -1,5 +1,6 @@
 #define LOCAL_LIBS express pandabase
 #define LOCAL_LIBS express pandabase
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolutil:c dtoolbase:c dtool:m
+#define USE_NSPR yes
 
 
 #begin lib_target
 #begin lib_target
   #define TARGET ipc
   #define TARGET ipc

+ 6 - 6
panda/src/net/Sources.pp

@@ -37,7 +37,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_datagram
   #define TARGET test_datagram
   #define LOCAL_LIBS net
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
 
   #define SOURCES \
   #define SOURCES \
     test_datagram.cxx
     test_datagram.cxx
@@ -47,7 +47,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_spam_client
   #define TARGET test_spam_client
   #define LOCAL_LIBS net
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
 
   #define SOURCES \
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_spam_client.cxx
     datagram_ui.cxx datagram_ui.h test_spam_client.cxx
@@ -57,7 +57,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_spam_server
   #define TARGET test_spam_server
   #define LOCAL_LIBS net
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
 
   #define SOURCES \
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_spam_server.cxx
     datagram_ui.cxx datagram_ui.h test_spam_server.cxx
@@ -67,7 +67,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_tcp_client
   #define TARGET test_tcp_client
   #define LOCAL_LIBS net
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
 
   #define SOURCES \
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_tcp_client.cxx
     datagram_ui.cxx datagram_ui.h test_tcp_client.cxx
@@ -77,7 +77,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_tcp_server
   #define TARGET test_tcp_server
   #define LOCAL_LIBS net
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
 
   #define SOURCES \
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_tcp_server.cxx
     datagram_ui.cxx datagram_ui.h test_tcp_server.cxx
@@ -87,7 +87,7 @@
 #begin test_bin_target
 #begin test_bin_target
   #define TARGET test_udp
   #define TARGET test_udp
   #define LOCAL_LIBS net
   #define LOCAL_LIBS net
-  #define OTHER_LIBS pystub
+  #define OTHER_LIBS $[OTHER_LIBS] pystub
 
 
   #define SOURCES \
   #define SOURCES \
     datagram_ui.cxx datagram_ui.h test_udp.cxx
     datagram_ui.cxx datagram_ui.h test_udp.cxx

+ 7 - 3
panda/src/sgraphutil/sceneGraphAnalyzer.cxx

@@ -99,9 +99,13 @@ write(ostream &out, int indent_level) const {
     << _num_instances << " instances).\n";
     << _num_instances << " instances).\n";
 
 
   indent(out, indent_level)
   indent(out, indent_level)
-    << _num_transforms << " transforms; "
-    << 100 * _num_arcs_with_transitions / _num_arcs 
-    << "% of arcs have some transition.\n";
+    << _num_transforms << " transforms";
+
+  if (_num_arcs != 0) {
+    out << "; " << 100 * _num_arcs_with_transitions / _num_arcs 
+	<< "% of arcs have some transition.";
+  }
+  out << "\n";
 
 
   indent(out, indent_level)
   indent(out, indent_level)
     << _num_geoms << " Geoms ";
     << _num_geoms << " Geoms ";