David Rose 23 éve
szülő
commit
da03dcffc4

+ 1 - 0
direct/src/interval/cInterval.cxx

@@ -19,6 +19,7 @@
 #include "cInterval.h"
 #include "indent.h"
 #include "clockObject.h"
+#include <math.h>
 
 TypeHandle CInterval::_type_handle;
 

+ 1 - 0
direct/src/interval/cLerpNodePathInterval.cxx

@@ -23,6 +23,7 @@
 #include "colorAttrib.h"
 #include "colorScaleAttrib.h"
 #include "dcast.h"
+#include "config_interval.h"
 
 TypeHandle CLerpNodePathInterval::_type_handle;
 

+ 2 - 2
direct/src/interval/cMetaInterval.I

@@ -93,8 +93,8 @@ get_c_interval(int n) const {
 ////////////////////////////////////////////////////////////////////
 INLINE int CMetaInterval::
 get_ext_index(int n) const {
-  nassertr(n >= 0 && n < (int)_defs.size(), NULL);
-  nassertr(_defs[n]._type == DT_ext_index, NULL);
+  nassertr(n >= 0 && n < (int)_defs.size(), -1);
+  nassertr(_defs[n]._type == DT_ext_index, -1);
   return _defs[n]._ext_index;
 }
 

+ 2 - 0
direct/src/interval/cMetaInterval.cxx

@@ -19,6 +19,8 @@
 #include "cMetaInterval.h"
 #include "config_interval.h"
 #include "indirectLess.h"
+#include "indent.h"
+
 #include <algorithm>
 #include <math.h>   // for log10()
 #include <stdio.h>  // for sprintf()

+ 2 - 0
direct/src/interval/cMetaInterval.h

@@ -21,10 +21,12 @@
 
 #include "directbase.h"
 #include "cInterval.h"
+#include "pointerTo.h"
 
 #include <pdeque.h>
 #include <pvector.h>
 #include <pset.h>
+#include <math.h>
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CMetaInterval

+ 1 - 0
direct/src/interval/hideInterval.h

@@ -21,6 +21,7 @@
 
 #include "directbase.h"
 #include "cInterval.h"
+#include "nodePath.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : HideInterval

+ 1 - 0
direct/src/interval/showInterval.h

@@ -21,6 +21,7 @@
 
 #include "directbase.h"
 #include "cInterval.h"
+#include "nodePath.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : ShowInterval