From 4dd11b322d211d9b26b369e62eac6e7e22902980 Mon Sep 17 00:00:00 2001
From: hybrid <hybrid@dfc29bdd-3216-0410-991c-e03cc46cb475>
Date: Sun, 31 Aug 2008 10:33:47 +0000
Subject: [PATCH] Cleanup of some helper structs.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1521 dfc29bdd-3216-0410-991c-e03cc46cb475
---
 source/Irrlicht/CSceneManager.cpp |  6 ++--
 source/Irrlicht/CSceneManager.h   | 54 ++++++++++++++-----------------
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp
index 6bd6dd84..ee88009a 100644
--- a/source/Irrlicht/CSceneManager.cpp
+++ b/source/Irrlicht/CSceneManager.cpp
@@ -1292,7 +1292,7 @@ void CSceneManager::drawAll()
 
 		u32 maxLights = core::min_ ( Driver->getMaximalDynamicLightAmount(), LightList.size() );
 		for (i=0; i< maxLights; ++i)
-			LightList[i].node->render();
+			LightList[i].Node->render();
 
 		LightList.set_used(0);
 	}
@@ -1314,7 +1314,7 @@ void CSceneManager::drawAll()
 		SolidNodeList.sort(); // sort by textures
 
 		for (i=0; i<SolidNodeList.size(); ++i)
-			SolidNodeList[i].node->render();
+			SolidNodeList[i].Node->render();
 
 		Parameters.setAttribute ( "drawn", (s32) SolidNodeList.size() );
 
@@ -1340,7 +1340,7 @@ void CSceneManager::drawAll()
 		TransparentNodeList.sort(); // sort by distance from camera
 
 		for (i=0; i<TransparentNodeList.size(); ++i)
-			TransparentNodeList[i].node->render();
+			TransparentNodeList[i].Node->render();
 
 		TransparentNodeList.set_used(0);
 	}
diff --git a/source/Irrlicht/CSceneManager.h b/source/Irrlicht/CSceneManager.h
index 50d54c2e..db8077de 100644
--- a/source/Irrlicht/CSceneManager.h
+++ b/source/Irrlicht/CSceneManager.h
@@ -478,69 +478,63 @@ namespace scene
 
 		struct DefaultNodeEntry
 		{
-			DefaultNodeEntry() {};
-
-			DefaultNodeEntry(ISceneNode* n)
+			DefaultNodeEntry(ISceneNode* n) :
+				Node(n), TextureValue(0)
 			{
-				textureValue = 0;
-
 				if (n->getMaterialCount())
-					textureValue = (n->getMaterial(0).getTexture(0));
-
-				node = n;
+					TextureValue = (n->getMaterial(0).getTexture(0));
 			}
 
-			ISceneNode* node;
-			void* textureValue;
-
 			bool operator < (const DefaultNodeEntry& other) const
 			{
-				return (textureValue < other.textureValue);
+				return (TextureValue < other.TextureValue);
 			}
+
+			ISceneNode* Node;
+			private:
+			void* TextureValue;
 		};
 
 
 		struct TransparentNodeEntry
 		{
-			TransparentNodeEntry() : node(0), distance(0.f) {};
-
-			TransparentNodeEntry(ISceneNode* n, const core::vector3df &camera)
-				: node(n)
+			TransparentNodeEntry(ISceneNode* n, const core::vector3df& camera)
+				: Node(n)
 			{
-				distance = (f32)(node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(camera));
+				Distance = (f32)(Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(camera));
 			}
 
 			bool operator < (const TransparentNodeEntry& other) const
 			{
-				return (distance > other.distance);
+				return (Distance > other.Distance);
 			}
 
-			ISceneNode* node;
-			f32 distance;
+			ISceneNode* Node;
+			private:
+			f32 Distance;
 		};
 
 		//! sort on distance (sphere) to camera
 		struct DistanceNodeEntry
 		{
-			DistanceNodeEntry() : node(0), distance(0.) {}
-
 			DistanceNodeEntry(ISceneNode* n, f64 d)
-				: node(n), distance(d) {}
+				: Node(n), Distance(d) {}
 
-			DistanceNodeEntry(ISceneNode* n, const core::vector3df &cameraPos)
-				: node(n)
+			DistanceNodeEntry(ISceneNode* n, const core::vector3df& cameraPos)
+				: Node(n)
 			{
-				distance = node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(cameraPos);
-				distance -= node->getBoundingBox().getExtent().getLengthSQ() * 0.5;
+				Distance = Node->getAbsoluteTransformation().getTranslation().getDistanceFromSQ(cameraPos);
+				Distance -= Node->getBoundingBox().getExtent().getLengthSQ() * 0.5;
 			}
 
 			bool operator < (const DistanceNodeEntry& other) const
 			{
-				return distance < other.distance;
+				return Distance < other.Distance;
 			}
 
-			ISceneNode* node;
-			f64 distance;
+			ISceneNode* Node;
+			private:
+			f64 Distance;
 		};
 
 		//! video driver