projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove FPS from being next to the version string
[oweals/minetest.git]
/
src
/
sky.h
diff --git
a/src/sky.h
b/src/sky.h
index 06a99310371f8b37de242806dd850d8f66091a6c..d7dabedb80640315520de95c81ffa92d1ac1dc5d 100644
(file)
--- a/
src/sky.h
+++ b/
src/sky.h
@@
-19,12
+19,12
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_extrabloated.h"
#include <ISceneNode.h>
#include "irrlichttypes_extrabloated.h"
#include <ISceneNode.h>
-#include "
localplayer
.h"
+#include "
camera
.h"
#ifndef SKY_HEADER
#define SKY_HEADER
#ifndef SKY_HEADER
#define SKY_HEADER
-#define SKY_MATERIAL_COUNT
3
+#define SKY_MATERIAL_COUNT
5
#define SKY_STAR_COUNT 200
// Skybox, rendered with zbuffer turned off, before all other nodes.
#define SKY_STAR_COUNT 200
// Skybox, rendered with zbuffer turned off, before all other nodes.
@@
-32,7
+32,7
@@
class Sky : public scene::ISceneNode
{
public:
//! constructor
{
public:
//! constructor
- Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id
, LocalPlayer* player
);
+ Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id);
virtual void OnRegisterSceneNode();
virtual void OnRegisterSceneNode();
@@
-50,7
+50,8
@@
public:
{ return SKY_MATERIAL_COUNT; }
void update(float m_time_of_day, float time_brightness,
{ return SKY_MATERIAL_COUNT; }
void update(float m_time_of_day, float time_brightness,
- float direct_brightness, bool sunlight_seen);
+ float direct_brightness, bool sunlight_seen, CameraMode cam_mode,
+ float yaw, float pitch);
float getBrightness(){ return m_brightness; }
float getBrightness(){ return m_brightness; }
@@
-125,9
+126,11
@@
private:
video::SColor m_skycolor;
video::SColorf m_cloudcolor_f;
v3f m_stars[SKY_STAR_COUNT];
video::SColor m_skycolor;
video::SColorf m_cloudcolor_f;
v3f m_stars[SKY_STAR_COUNT];
- u16 m_star_indices[SKY_STAR_COUNT*4];
video::S3DVertex m_star_vertices[SKY_STAR_COUNT*4];
video::S3DVertex m_star_vertices[SKY_STAR_COUNT*4];
- LocalPlayer* m_player;
+ video::ITexture* m_sun_texture;
+ video::ITexture* m_moon_texture;
+ video::ITexture* m_sun_tonemap;
+ video::ITexture* m_moon_tonemap;
};
#endif
};
#endif