v2d & aabbox3d<f32> & sky cleanups

* Sky: rename Box => m_box and inline getBoundingBox
* Uniformize aabbox3d<f32> to aabb3f

diff --git a/src/client.cpp b/src/client.cpp
index a845277bdc19d997ab78e6ee1d70de97019588b1..2dc537782b0dbac1931a15a5c3366673549b0b3a 100644 (file)
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1471,13 +1471,13 @@ ClientActiveObject * Client::getSelectedActiveObject(
        {
                ClientActiveObject *obj = objects[i].obj;
 
-               core::aabbox3d<f32> *selection_box = obj->getSelectionBox();
+               aabb3f *selection_box = obj->getSelectionBox();
                if(selection_box == NULL)
                        continue;
 
                v3f pos = obj->getPosition();
 
-               core::aabbox3d<f32> offsetted_box(
+               aabb3f offsetted_box(
                                selection_box->MinEdge + pos,
                                selection_box->MaxEdge + pos
                );

diff --git a/src/client/tile.h b/src/client/tile.h
index 7796e801d75bb7cbdc48f154a4fa9c5f3ddb3ece..b759168413be36687a2432bb6b3d1b7fa3c91f4e 100644 (file)
--- a/src/client/tile.h
+++ b/src/client/tile.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define TILE_HEADER
 
 #include "irrlichttypes.h"
-#include "irr_v2d.h"
 #include "irr_v3d.h"
 #include <ITexture.h>
 #include <IrrlichtDevice.h>

diff --git a/src/clientmap.cpp b/src/clientmap.cpp
index 024f2a266e2beb69a330de54b2ab5a3d0f180121..e67b6cbf76965680d1693727cee102fc8fe5fbae 100644 (file)
--- a/src/clientmap.cpp
+++ b/src/clientmap.cpp
@@ -50,7 +50,7 @@ ClientMap::ClientMap(
        m_camera_direction(0,0,1),
        m_camera_fov(M_PI)
 {
-       m_box = core::aabbox3d<f32>(-BS*1000000,-BS*1000000,-BS*1000000,
+       m_box = aabb3f(-BS*1000000,-BS*1000000,-BS*1000000,
                        BS*1000000,BS*1000000,BS*1000000);
 
        /* TODO: Add a callback function so these can be updated when a setting

diff --git a/src/clientmap.h b/src/clientmap.h
index d9239b52e19eacddfe7122b87a4055418ee3cbd7..ae5ab6d3592fb0e29b77e478742e9ddb8ba5258a 100644 (file)
--- a/src/clientmap.h
+++ b/src/clientmap.h
@@ -115,7 +115,7 @@ public:
                renderMap(driver, SceneManager->getSceneNodeRenderPass());
        }
        
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
+       virtual const aabb3f &getBoundingBox() const
        {
                return m_box;
        }
@@ -140,7 +140,7 @@ public:
 private:
        Client *m_client;
        
-       core::aabbox3d<f32> m_box;
+       aabb3f m_box;
        
        MapDrawControl &m_control;
 

diff --git a/src/clientobject.h b/src/clientobject.h
index be24e1388681e4776c9f537481457e5522124e7d..3cc7c239156119c79eeaeb91f1d48edbf02632ab 100644 (file)
--- a/src/clientobject.h
+++ b/src/clientobject.h
@@ -56,7 +56,7 @@ public:
        virtual void updateLight(u8 light_at_pos){}
        virtual void updateLightNoCheck(u8 light_at_pos){}
        virtual v3s16 getLightPosition(){return v3s16(0,0,0);}
-       virtual core::aabbox3d<f32>* getSelectionBox(){return NULL;}
+       virtual aabb3f *getSelectionBox() { return NULL; }
        virtual bool getCollisionBox(aabb3f *toset){return false;}
        virtual bool collideWithObjects(){return false;}
        virtual v3f getPosition(){return v3f(0,0,0);}

diff --git a/src/clouds.cpp b/src/clouds.cpp
index 29210e2b4cda1ded6be22379ec81d71baa31c83c..82b63b6b35006d64609a8e9609d40697de32a004 100644 (file)
--- a/src/clouds.cpp
+++ b/src/clouds.cpp
@@ -62,7 +62,7 @@ Clouds::Clouds(
        g_settings->registerChangedCallback("enable_3d_clouds",
                &cloud_3d_setting_changed, this);
 
-       m_box = core::aabbox3d<f32>(-BS*1000000,m_cloud_y-BS,-BS*1000000,
+       m_box = aabb3f(-BS*1000000,m_cloud_y-BS,-BS*1000000,
                        BS*1000000,m_cloud_y+BS,BS*1000000);
 
 }

diff --git a/src/clouds.h b/src/clouds.h
index 195f48de044e32cb121cb97b9afaca8ec31dd406..9c6b417866cafd8546164f194f5f1a6b271e80dc 100644 (file)
--- a/src/clouds.h
+++ b/src/clouds.h
@@ -53,7 +53,7 @@ public:
 
        virtual void render();
        
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
+       virtual const aabb3f &getBoundingBox() const
        {
                return m_box;
        }
@@ -79,7 +79,7 @@ public:
        void updateCameraOffset(v3s16 camera_offset)
        {
                m_camera_offset = camera_offset;
-               m_box = core::aabbox3d<f32>(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000,
+               m_box = aabb3f(-BS * 1000000, m_cloud_y - BS - BS * camera_offset.Y, -BS * 1000000,
                        BS * 1000000, m_cloud_y + BS - BS * camera_offset.Y, BS * 1000000);
        }
 
@@ -87,7 +87,7 @@ public:
 
 private:
        video::SMaterial m_material;
-       core::aabbox3d<f32> m_box;
+       aabb3f m_box;
        s16 m_passed_cloud_y;
        float m_cloud_y;
        u16 m_cloud_radius_i;

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index c3247bd17036f3b1de63f712cb4382b9e35a39cb..e7c7a0be5fbf8eace98a7f6760cf42ded7f8f201 100644 (file)
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -309,7 +309,7 @@ public:
 
        void initialize(const std::string &data);
 
-       core::aabbox3d<f32>* getSelectionBox()
+       aabb3f *getSelectionBox()
                {return &m_selection_box;}
        v3f getPosition()
                {return m_position;}
@@ -319,7 +319,7 @@ public:
 
        bool getCollisionBox(aabb3f *toset) { return false; }
 private:
-       core::aabbox3d<f32> m_selection_box;
+       aabb3f m_selection_box;
        scene::IMeshSceneNode *m_node;
        v3f m_position;
        std::string m_itemstring;
@@ -674,7 +674,7 @@ GenericCAO::~GenericCAO()
        removeFromScene(true);
 }
 
-core::aabbox3d<f32>* GenericCAO::getSelectionBox()
+aabb3f *GenericCAO::getSelectionBox()
 {
        if(!m_prop.is_visible || !m_is_visible || m_is_local_player || getParent() != NULL)
                return NULL;
@@ -1185,7 +1185,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 
                if(m_prop.physical)
                {
-                       core::aabbox3d<f32> box = m_prop.collisionbox;
+                       aabb3f box = m_prop.collisionbox;
                        box.MinEdge *= BS;
                        box.MaxEdge *= BS;
                        collisionMoveResult moveresult;

diff --git a/src/content_cao.h b/src/content_cao.h
index abb242aa4d5906e3a6654f3b189cd1d47bc1085d..f71dfeb1f36c16f6c813d08eb1be1ad23d539475 100644 (file)
--- a/src/content_cao.h
+++ b/src/content_cao.h
@@ -65,7 +65,7 @@ private:
        //
        scene::ISceneManager *m_smgr;
        IrrlichtDevice *m_irr;
-       core::aabbox3d<f32> m_selection_box;
+       aabb3f m_selection_box;
        scene::IMeshSceneNode *m_meshnode;
        scene::IAnimatedMeshSceneNode *m_animated_meshnode;
        WieldMeshSceneNode *m_wield_meshnode;
@@ -127,7 +127,7 @@ public:
 
        bool collideWithObjects();
 
-       core::aabbox3d<f32>* getSelectionBox();
+       aabb3f *getSelectionBox();
 
        v3f getPosition();
 

diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index fa24548216f37bc7a37d4634facc3da3384a3c06..53bf3154f593fb39c429876e850fe9280c141da9 100644 (file)
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -259,7 +259,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
        else
        {
                if(m_prop.physical){
-                       core::aabbox3d<f32> box = m_prop.collisionbox;
+                       aabb3f box = m_prop.collisionbox;
                        box.MinEdge *= BS;
                        box.MaxEdge *= BS;
                        collisionMoveResult moveresult;
@@ -786,7 +786,7 @@ PlayerSAO::PlayerSAO(ServerEnvironment *env_, Player *player_, u16 peer_id_,
        m_prop.hp_max = PLAYER_MAX_HP;
        m_prop.physical = false;
        m_prop.weight = 75;
-       m_prop.collisionbox = core::aabbox3d<f32>(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.);
+       m_prop.collisionbox = aabb3f(-1/3.,-1.0,-1/3., 1/3.,1.0,1/3.);
        // start of default appearance, this should be overwritten by LUA
        m_prop.visual = "upright_sprite";
        m_prop.visual_size = v2f(1, 2);

diff --git a/src/mesh.cpp b/src/mesh.cpp
index 3c39322044f78d35c14a25d7d917ac649dcab488..b5bf8660a308845478f6bd8e1e2af1b1938c3642 100644 (file)
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -104,7 +104,7 @@ void scaleMesh(scene::IMesh *mesh, v3f scale)
        if (mesh == NULL)
                return;
 
-       core::aabbox3d<f32> bbox;
+       aabb3f bbox;
        bbox.reset(0, 0, 0);
 
        u32 mc = mesh->getMeshBufferCount();
@@ -132,7 +132,7 @@ void translateMesh(scene::IMesh *mesh, v3f vec)
        if (mesh == NULL)
                return;
 
-       core::aabbox3d<f32> bbox;
+       aabb3f bbox;
        bbox.reset(0, 0, 0);
 
        u32 mc = mesh->getMeshBufferCount();
@@ -346,7 +346,7 @@ void rotateMeshBy6dFacedir(scene::IMesh *mesh, int facedir)
 
 void recalculateBoundingBox(scene::IMesh *src_mesh)
 {
-       core::aabbox3d<f32> bbox;
+       aabb3f bbox;
        bbox.reset(0,0,0);
        for (u16 j = 0; j < src_mesh->getMeshBufferCount(); j++) {
                scene::IMeshBuffer *buf = src_mesh->getMeshBuffer(j);

diff --git a/src/object_properties.h b/src/object_properties.h
index 02ec9d1f79b741fa972d32ee5c8f835d5b7f3540..082d9a5290ea945e0f7cb6b418acbd9a369fe4b5 100644 (file)
--- a/src/object_properties.h
+++ b/src/object_properties.h
@@ -33,7 +33,7 @@ struct ObjectProperties
        bool physical;
        bool collideWithObjects;
        float weight;
-       core::aabbox3d<f32> collisionbox;
+       aabb3f collisionbox;
        std::string visual;
        std::string mesh;
        v2f visual_size;

diff --git a/src/particles.cpp b/src/particles.cpp
index 8150e19acb90e92a20aad3c7713813f53fe160fa..ab77e9f54c8cba2924409688fa368a6015f4c000 100644 (file)
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -88,7 +88,7 @@ Particle::Particle(
        m_vertical = vertical;
 
        // Irrlicht stuff
-       m_collisionbox = core::aabbox3d<f32>
+       m_collisionbox = aabb3f
                        (-size/2,-size/2,-size/2,size/2,size/2,size/2);
        this->setAutomaticCulling(scene::EAC_OFF);
 
@@ -128,7 +128,7 @@ void Particle::step(float dtime)
        m_time += dtime;
        if (m_collisiondetection)
        {
-               core::aabbox3d<f32> box = m_collisionbox;
+               aabb3f box = m_collisionbox;
                v3f p_pos = m_pos*BS;
                v3f p_velocity = m_velocity*BS;
                collisionMoveSimple(m_env, m_gamedef,

diff --git a/src/particles.h b/src/particles.h
index 0ad8d71b5a860cdbd14a5106ec458518bdcacebd..dda84385c1bf49df9571b62823153b26506adf71 100644 (file)
--- a/src/particles.h
+++ b/src/particles.h
@@ -52,7 +52,7 @@ class Particle : public scene::ISceneNode
        );
        ~Particle();
 
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
+       virtual const aabb3f &getBoundingBox() const
        {
                return m_box;
        }
@@ -85,8 +85,8 @@ private:
 
        ClientEnvironment *m_env;
        IGameDef *m_gamedef;
-       core::aabbox3d<f32> m_box;
-       core::aabbox3d<f32> m_collisionbox;
+       aabb3f m_box;
+       aabb3f m_collisionbox;
        video::SMaterial m_material;
        v2f m_texpos;
        v2f m_texsize;

diff --git a/src/player.h b/src/player.h
index 48b0a499938b0206e2682b7527f78d275ec4a5f6..0d99297cadece6b033c9d4a44b4c9275ae696f71 100644 (file)
--- a/src/player.h
+++ b/src/player.h
@@ -198,7 +198,7 @@ public:
                return m_name;
        }
 
-       core::aabbox3d<f32> getCollisionbox()
+       aabb3f getCollisionbox()
        {
                return m_collisionbox;
        }
@@ -398,7 +398,7 @@ protected:
        f32 m_yaw;
        v3f m_speed;
        v3f m_position;
-       core::aabbox3d<f32> m_collisionbox;
+       aabb3f m_collisionbox;
 
        bool m_dirty;
 

diff --git a/src/script/lua_api/l_areastore.cpp b/src/script/lua_api/l_areastore.cpp
index 72fe24b206c4687933226e09a3c72ddf12a16cce..4148780a1d36168934dd23b173614063e2f84695 100644 (file)
--- a/src/script/lua_api/l_areastore.cpp
+++ b/src/script/lua_api/l_areastore.cpp
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
 #include "cpp_api/s_security.h"
+#include "irr_v3d.h"
 #include "areastore.h"
 #include "filesys.h"
 #ifndef ANDROID

diff --git a/src/script/lua_api/l_areastore.h b/src/script/lua_api/l_areastore.h
index a255296270c4dc9ddb3fa1a060ccc3f9f4f5b4bd..543a2aa32f65f5b0d1fa4445ce8a24b816c6f68f 100644 (file)
--- a/src/script/lua_api/l_areastore.h
+++ b/src/script/lua_api/l_areastore.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define L_AREASTORE_H_
 
 #include "lua_api/l_base.h"
-#include "irr_v3d.h"
 #include "areastore.h"
 
 /*

diff --git a/src/sky.cpp b/src/sky.cpp
index 01fb8ef860ed140e5d434d59139727c8ddbd71d8..682ff05e3f425a6a25f2d19513fbe1d5d9d70ea7 100644 (file)
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -25,8 +25,8 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
                m_cloudcolor_bright_f(1,1,1,1)
 {
        setAutomaticCulling(scene::EAC_OFF);
-       Box.MaxEdge.set(0,0,0);
-       Box.MinEdge.set(0,0,0);
+       m_box.MaxEdge.set(0,0,0);
+       m_box.MinEdge.set(0,0,0);
 
        // create material
 
@@ -94,11 +94,6 @@ void Sky::OnRegisterSceneNode()
        scene::ISceneNode::OnRegisterSceneNode();
 }
 
-const core::aabbox3d<f32>& Sky::getBoundingBox() const
-{
-       return Box;
-}
-
 //! renders the node.
 void Sky::render()
 {

diff --git a/src/sky.h b/src/sky.h
index 5023cc68264581fac36cb021abfc93fe4b1afd12..f1989177351a7c9420459353b5165851ac1e9789 100644 (file)
--- a/src/sky.h
+++ b/src/sky.h
@@ -42,7 +42,8 @@ public:
        //! renders the node.
        virtual void render();
 
-       virtual const core::aabbox3d<f32>& getBoundingBox() const;
+       virtual const aabb3f &getBoundingBox() const
+       { return m_box; }
 
        // Used by Irrlicht for optimizing rendering
        virtual video::SMaterial& getMaterial(u32 i)
@@ -74,7 +75,7 @@ public:
        }
 
 private:
-       core::aabbox3d<f32> Box;
+       aabb3f m_box;
        video::SMaterial m_materials[SKY_MATERIAL_COUNT];
 
        // How much sun & moon transition should affect horizon color

diff --git a/src/util/numeric.h b/src/util/numeric.h
index e742ab24aa2a5ab7340ec83333d4e2881eb24d9e..615327864d22474bb829d202eb9b4281cdc596ef 100644 (file)
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -310,9 +310,9 @@ inline v3f intToFloat(v3s16 p, f32 d)
 }
 
 // Random helper. Usually d=BS
-inline core::aabbox3d<f32> getNodeBox(v3s16 p, float d)
+inline aabb3f getNodeBox(v3s16 p, float d)
 {
-       return core::aabbox3d<f32>(
+       return aabb3f(
                (float)p.X * d - 0.5*d,
                (float)p.Y * d - 0.5*d,
                (float)p.Z * d - 0.5*d,

diff --git a/src/wieldmesh.h b/src/wieldmesh.h
index c29c06f956a2f674435e2de6ae8edf2aa1594179..0b3136bc1465d3f145cd82b872922fe43ebc6ec2 100644 (file)
--- a/src/wieldmesh.h
+++ b/src/wieldmesh.h
@@ -53,7 +53,7 @@ public:
 
        virtual void render();
 
-       virtual const core::aabbox3d<f32>& getBoundingBox() const
+       virtual const aabb3f &getBoundingBox() const
        { return m_bounding_box; }
 
 private:
@@ -74,7 +74,7 @@ private:
        // Bounding box culling is disabled for this type of scene node,
        // so this variable is just required so we can implement
        // getBoundingBox() and is set to an empty box.
-       core::aabbox3d<f32> m_bounding_box;
+       aabb3f m_bounding_box;
 };
 
 scene::IMesh *getItemMesh(IGameDef *gamedef, const ItemStack &item);