Remove using std:: from the metar header, remove HTTP support, add very basic unit...

[simgear.git] / simgear / scene / util / SGNodeMasks.hxx

diff --git a/simgear/scene/util/SGNodeMasks.hxx b/simgear/scene/util/SGNodeMasks.hxx
index 79ac6eb94f0236b06f0f22b651e04011f1762c3e..19520eb6d1d3d0a8098c0bf20216c91c1c623aef 100644 (file)
--- a/simgear/scene/util/SGNodeMasks.hxx
+++ b/simgear/scene/util/SGNodeMasks.hxx
@@ -22,19 +22,18 @@
 #ifndef SG_SCENE_NODEMASKS_HXX
 #define SG_SCENE_NODEMASKS_HXX
 
+#include "RenderConstants.hxx"
+
 /// If set, do terrain elevation computations with that nodes
-#define SG_NODEMASK_TERRAIN_BIT        (1<<0)
+#define SG_NODEMASK_TERRAIN_BIT        simgear::TERRAIN_BIT
 /// If set, this is the main model of this simulation
-#define SG_NODEMASK_MAINMODEL_BIT      (1<<1)
+#define SG_NODEMASK_MAINMODEL_BIT      simgear::MAINMODEL_BIT
 /// If set, cast shadows
-#define SG_NODEMASK_CASTSHADOW_BIT     (1<<2)
+#define SG_NODEMASK_CASTSHADOW_BIT     simgear::CASTSHADOW_BIT
 /// If set, cast recieves shadows
-#define SG_NODEMASK_RECIEVESHADOW_BIT  (1<<3)
-/// If set, the node is a gui element
-#define SG_NODEMASK_GUI_BIT            (1<<4)
-/// If set, the node is a 2D panel
-#define SG_NODEMASK_2DPANEL_BIT        (1<<5)
+#define SG_NODEMASK_RECIEVESHADOW_BIT  simgear::RECEIVESHADOW_BIT
+#define SG_NODEMASK_GUI_BIT            simgear::GUI_BIT
+#define SG_NODEMASK_2DPANEL_BIT        simgear::PANEL2D_BIT
 /// If set, the node is pickable
-#define SG_NODEMASK_PICK_BIT           (1<<6)
-
+#define SG_NODEMASK_PICK_BIT           simgear::PICK_BIT
 #endif