Set acceleration only once in falling node

[minetest.git] / src / sky.cpp

diff --git a/src/sky.cpp b/src/sky.cpp
index ac8e2cbf6d512a698ed5bfbfcd4011a33a2d3719..682ff05e3f425a6a25f2d19513fbe1d5d9d70ea7 100644 (file)
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -4,13 +4,12 @@
 #include "ICameraSceneNode.h"
 #include "S3DVertex.h"
 #include "client/tile.h"
-#include "noise.h" // easeCurve
-#include "main.h" // g_profiler
+#include "noise.h"            // easeCurve
 #include "profiler.h"
-#include "util/numeric.h" // MYMIN
+#include "util/numeric.h"
 #include <cmath>
 #include "settings.h"
-#include "camera.h" // CameraModes
+#include "camera.h"           // CameraModes
 
 //! constructor
 Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
@@ -26,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
 
@@ -47,14 +46,14 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
        m_materials[1].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 
        m_materials[2] = mat;
-       m_materials[2].setTexture(0, tsrc->getTexture("sunrisebg.png"));
+       m_materials[2].setTexture(0, tsrc->getTextureForMesh("sunrisebg.png"));
        m_materials[2].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
        //m_materials[2].MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
 
        m_sun_texture = tsrc->isKnownSourceImage("sun.png") ?
-               tsrc->getTexture("sun.png") : NULL;
+               tsrc->getTextureForMesh("sun.png") : NULL;
        m_moon_texture = tsrc->isKnownSourceImage("moon.png") ?
-               tsrc->getTexture("moon.png") : NULL;
+               tsrc->getTextureForMesh("moon.png") : NULL;
        m_sun_tonemap = tsrc->isKnownSourceImage("sun_tonemap.png") ?
                tsrc->getTexture("sun_tonemap.png") : NULL;
        m_moon_tonemap = tsrc->isKnownSourceImage("moon_tonemap.png") ?
@@ -95,11 +94,6 @@ void Sky::OnRegisterSceneNode()
        scene::ISceneNode::OnRegisterSceneNode();
 }
 
-const core::aabbox3d<f32>& Sky::getBoundingBox() const
-{
-       return Box;
-}
-
 //! renders the node.
 void Sky::render()
 {