projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add LuaSecureRandom
[oweals/minetest.git]
/
src
/
clientmap.h
diff --git
a/src/clientmap.h
b/src/clientmap.h
index 786f35b77f0a7ecd73dfac6b73e59d6438a27ded..54d1dc96d97a538ce95948541ea9e1b854cc82e9 100644
(file)
--- a/
src/clientmap.h
+++ b/
src/clientmap.h
@@
-22,6
+22,9
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_extrabloated.h"
#include "map.h"
#include "irrlichttypes_extrabloated.h"
#include "map.h"
+#include "camera.h"
+#include <set>
+#include <map>
struct MapDrawControl
{
struct MapDrawControl
{
@@
-31,7
+34,8
@@
struct MapDrawControl
wanted_max_blocks(0),
wanted_min_range(0),
blocks_drawn(0),
wanted_max_blocks(0),
wanted_min_range(0),
blocks_drawn(0),
- blocks_would_have_drawn(0)
+ blocks_would_have_drawn(0),
+ farthest_drawn(0)
{
}
// Overrides limits by drawing everything
{
}
// Overrides limits by drawing everything
@@
-46,6
+50,8
@@
struct MapDrawControl
u32 blocks_drawn;
// Number of blocks that would have been drawn in wanted_range
u32 blocks_would_have_drawn;
u32 blocks_drawn;
// Number of blocks that would have been drawn in wanted_range
u32 blocks_would_have_drawn;
+ // Distance to the farthest block drawn
+ float farthest_drawn;
};
class Client;
};
class Client;
@@
-81,12
+87,13
@@
public:
ISceneNode::drop();
}
ISceneNode::drop();
}
- void updateCamera(v3f pos, v3f dir, f32 fov)
+ void updateCamera(v3f pos, v3f dir, f32 fov
, v3s16 offset
)
{
{
-
J
MutexAutoLock lock(m_camera_mutex);
+ MutexAutoLock lock(m_camera_mutex);
m_camera_position = pos;
m_camera_direction = dir;
m_camera_fov = fov;
m_camera_position = pos;
m_camera_direction = dir;
m_camera_fov = fov;
+ m_camera_offset = offset;
}
/*
}
/*
@@
-120,7
+127,7
@@
public:
int getBackgroundBrightness(float max_d, u32 daylight_factor,
int oldvalue, bool *sunlight_seen_result);
int getBackgroundBrightness(float max_d, u32 daylight_factor,
int oldvalue, bool *sunlight_seen_result);
- void renderPostFx();
+ void renderPostFx(
CameraMode cam_mode
);
// For debug printing
virtual void PrintInfo(std::ostream &out);
// For debug printing
virtual void PrintInfo(std::ostream &out);
@@
-128,7
+135,7
@@
public:
// Check if sector was drawn on last render()
bool sectorWasDrawn(v2s16 p)
{
// Check if sector was drawn on last render()
bool sectorWasDrawn(v2s16 p)
{
- return (m_last_drawn_sectors.find(p) !=
NULL
);
+ return (m_last_drawn_sectors.find(p) !=
m_last_drawn_sectors.end()
);
}
private:
}
private:
@@
-141,11
+148,16
@@
private:
v3f m_camera_position;
v3f m_camera_direction;
f32 m_camera_fov;
v3f m_camera_position;
v3f m_camera_direction;
f32 m_camera_fov;
- JMutex m_camera_mutex;
+ v3s16 m_camera_offset;
+ Mutex m_camera_mutex;
-
core
::map<v3s16, MapBlock*> m_drawlist;
+
std
::map<v3s16, MapBlock*> m_drawlist;
- core::map<v2s16, bool> m_last_drawn_sectors;
+ std::set<v2s16> m_last_drawn_sectors;
+
+ bool m_cache_trilinear_filter;
+ bool m_cache_bilinear_filter;
+ bool m_cache_anistropic_filter;
};
#endif
};
#endif