*Merge.

--HG--
branch : trunk

1 files changed, 41 insertions, 41 deletions

diff --git a/contrib/vmap_debugger/ModelContainerView.h b/contrib/vmap_debugger/ModelContainerView.h
index 28d992a0c16..3371d263808 100644
--- a/contrib/vmap_debugger/ModelContainerView.h
+++ b/contrib/vmap_debugger/ModelContainerView.h
@@ -12,78 +12,78 @@
 
 namespace VMAP
 {
-	//==========================================
+    //==========================================
 
 
-	//==========================================
+    //==========================================
 
-	class ModelContainerView : 
-		public G3D::GApp
-	{
-	private:
+    class ModelContainerView :
+        public G3D::GApp
+    {
+    private:
         SkyRef              iSky;
         LightingRef         iLighting;
         SkyParameters       iSkyParameters;
 
-		VARAreaRef iVARAreaRef;
-		Table<std::string , VAR*> iTriVarTable;
-		Table<std::string , Array<int> > iTriIndexTable;
+        VARAreaRef iVARAreaRef;
+        Table<std::string , VAR*> iTriVarTable;
+        Table<std::string , Array<int> > iTriIndexTable;
 
-		VARAreaRef iVARAreaRef2;
+        VARAreaRef iVARAreaRef2;
         VAR iTriDebugVar;
         Array<Vector3> iVTriDebugArray;
         Array<int> iTriDebugArray;
 
         //Array<int> iLineIndexArray;
 
-		GApp* i_App;
-		CommandFileRW iCommandFileRW;
-		Array<Command> iCmdArray;
-		int iCurrCmdIndex;
+        GApp* i_App;
+        CommandFileRW iCommandFileRW;
+        Array<Command> iCmdArray;
+        int iCurrCmdIndex;
 
-		VMapManager* iVMapManager;
+        VMapManager* iVMapManager;
 
-		Vector3 iPos1;
-		Vector3 iPos2;
-		Color3 iColor;
-		bool iDrawLine;
-		int iInstanceId;
+        Vector3 iPos1;
+        Vector3 iPos2;
+        Color3 iColor;
+        bool iDrawLine;
+        int iInstanceId;
         bool iPosSent;
         Array<Command> iPrevLoadCommands;
-	private:
-		Vector3 convertPositionToMangosRep(float x, float y, float z) const;
+    private:
+        Vector3 convertPositionToTrinityRep(float x, float y, float z) const;
 
-	public:
-		ModelContainerView(const G3D::GApp::Settings& settings);
+    public:
+        ModelContainerView(const G3D::GApp::Settings& settings);
 
-		~ModelContainerView(void);
+        ~ModelContainerView(void);
 
-		void addModelContainer(const std::string& pName,const ModelContainer* pModelContainer);
-		void removeModelContainer(const std::string& pName, const ModelContainer* pModelContainer);
-		void setViewPosition(const Vector3& pPosition);
+        void addModelContainer(const std::string& pName,const ModelContainer* pModelContainer);
+        void removeModelContainer(const std::string& pName, const ModelContainer* pModelContainer);
+        void setViewPosition(const Vector3& pPosition);
 
-		void onGraphics(RenderDevice* rd, Array<PosedModelRef> &posed3D, Array<PosedModel2DRef> &posed2D);
+        void onGraphics(RenderDevice* rd, Array<PosedModelRef> &posed3D, Array<PosedModel2DRef> &posed2D);
         virtual void onInit();
         void init();
-		void cleanup();
-		void onUserInput(UserInput* ui);
+        void cleanup();
+        void onUserInput(UserInput* ui);
 
-		void fillRenderArray(const SubModel& pSm,Array<TriangleBox> &pArray, const TreeNode* pTreeNode);
-		void fillVertexAndIndexArrays(const SubModel& pSm, Array<Vector3>& vArray, Array<int>& iArray);
+        void fillRenderArray(const SubModel& pSm,Array<TriangleBox> &pArray, const TreeNode* pTreeNode);
+        void fillVertexAndIndexArrays(const SubModel& pSm, Array<Vector3>& vArray, Array<int>& iArray);
 
-		bool loadAndShowTile(int pMapId, int x, int y);
-		void showMap(int pMapId, int x, int y);
+        bool loadAndShowTile(int pMapId, int x, int y);
+        void showMap(int pMapId, int x, int y);
 
-		void showMap(MapTree* mt, std::string dirFileName);
-		bool loadAndShowTile(int pMapId);
+        void showMap(MapTree* mt, std::string dirFileName);
+        bool loadAndShowTile(int pMapId);
 
 
-		void processCommand();
+        void processCommand();
 
-	};
+    };
 
-	//==========================================
-	//==========================================
+    //==========================================
+    //==========================================
 }
 
 #endif