oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-01 17:38:41 +00:00
Code Wiki Activity

v2d & aabbox3d<f32> & sky cleanups

Browse source 
* Sky: rename Box => m_box and inline getBoundingBox
* Uniformize aabbox3d<f32> to aabb3f
This commit is contained in:
nerzhul 2016-02-11 15:21:21 +01:00 • committed by est31
parent 24b312cc08
commit fefa148d69
21 changed files with 39 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/content_cao.cpp
View file

@ -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;