From 7dd2dc91816ab8b3bc3b99a1b1c99c7ea314d5a8 Mon Sep 17 00:00:00 2001
From: Xanadu <none@none>
Date: Sat, 17 Jul 2010 03:50:43 +0200
Subject: Correctly redo file moves/renames from rev. 8481.

--HG--
branch : trunk
rename : src/server/game/CollisionDetection/BoundingIntervalHierarchy.cpp => src/server/collision/BoundingIntervalHierarchy.cpp
rename : src/server/game/CollisionDetection/BoundingIntervalHierarchy.h => src/server/collision/BoundingIntervalHierarchy.h
rename : src/server/game/CollisionDetection/CMakeLists.txt => src/server/collision/CMakeLists.txt
rename : src/server/game/CollisionDetection/IVMapManager.h => src/server/collision/Management/IVMapManager.h
rename : src/server/game/CollisionDetection/VMapFactory.cpp => src/server/collision/Management/VMapFactory.cpp
rename : src/server/game/CollisionDetection/VMapFactory.h => src/server/collision/Management/VMapFactory.h
rename : src/server/game/CollisionDetection/VMapManager2.cpp => src/server/collision/Management/VMapManager2.cpp
rename : src/server/game/CollisionDetection/VMapManager2.h => src/server/collision/Management/VMapManager2.h
rename : src/server/game/CollisionDetection/MapTree.cpp => src/server/collision/Maps/MapTree.cpp
rename : src/server/game/CollisionDetection/MapTree.h => src/server/collision/Maps/MapTree.h
rename : src/server/game/CollisionDetection/TileAssembler.cpp => src/server/collision/Maps/TileAssembler.cpp
rename : src/server/game/CollisionDetection/TileAssembler.h => src/server/collision/Maps/TileAssembler.h
rename : src/server/game/CollisionDetection/ModelInstance.cpp => src/server/collision/Models/ModelInstance.cpp
rename : src/server/game/CollisionDetection/ModelInstance.h => src/server/collision/Models/ModelInstance.h
rename : src/server/game/CollisionDetection/WorldModel.cpp => src/server/collision/Models/WorldModel.cpp
rename : src/server/game/CollisionDetection/WorldModel.h => src/server/collision/Models/WorldModel.h
rename : src/server/game/CollisionDetection/VMapDefinitions.h => src/server/collision/VMapDefinitions.h
rename : src/server/game/CollisionDetection/VMapTools.h => src/server/collision/VMapTools.h
---
 src/server/game/CollisionDetection/ModelInstance.h | 81 ----------------------
 1 file changed, 81 deletions(-)
 delete mode 100644 src/server/game/CollisionDetection/ModelInstance.h

(limited to 'src/server/game/CollisionDetection/ModelInstance.h')

diff --git a/src/server/game/CollisionDetection/ModelInstance.h b/src/server/game/CollisionDetection/ModelInstance.h
deleted file mode 100644
index 97b3ab632a1..00000000000
--- a/src/server/game/CollisionDetection/ModelInstance.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _MODELINSTANCE_H_
-#define _MODELINSTANCE_H_
-
-#include <G3D/Matrix3.h>
-#include <G3D/Vector3.h>
-#include <G3D/AABox.h>
-#include <G3D/Ray.h>
-
-#include "Platform/Define.h"
-
-namespace VMAP
-{
-    class WorldModel;
-    struct AreaInfo;
-    struct LocationInfo;
-
-    enum ModelFlags
-    {
-        MOD_M2 = 1,
-        MOD_WORLDSPAWN = 1<<1,
-        MOD_HAS_BOUND = 1<<2
-    };
-
-    class ModelSpawn
-    {
-        public:
-            //mapID, tileX, tileY, Flags, ID, Pos, Rot, Scale, Bound_lo, Bound_hi, name
-            uint32 flags;
-            uint16 adtId;
-            uint32 ID;
-            G3D::Vector3 iPos;
-            G3D::Vector3 iRot;
-            float iScale;
-            G3D::AABox iBound;
-            std::string name;
-            bool operator==(const ModelSpawn &other) const { return ID == other.ID; }
-            //uint32 hashCode() const { return ID; }
-            // temp?
-            const G3D::AABox& getBounds() const { return iBound; }
-
-
-            static bool readFromFile(FILE *rf, ModelSpawn &spawn);
-            static bool writeToFile(FILE *rw, const ModelSpawn &spawn);
-    };
-
-    class ModelInstance: public ModelSpawn
-    {
-        public:
-            ModelInstance(): iModel(0) {}
-            ModelInstance(const ModelSpawn &spawn, WorldModel *model);
-            void setUnloaded() { iModel = 0; }
-            bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit) const;
-            void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const;
-            bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const;
-            bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const;
-        protected:
-            G3D::Matrix3 iInvRot;
-            float iInvScale;
-            WorldModel *iModel;
-    };
-} // namespace VMAP
-
-#endif // _MODELINSTANCE
-- 
cgit v1.2.3