Extex101
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scripting WIP

master
Perttu Ahola 2011-11-12 12:12:15 +02:00
parent 526eedf98e
commit b35adfbd2d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/content_sao.cpp
View File

@ -1509,7 +1509,8 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
m_prop(new LuaEntityProperties), m_prop(new LuaEntityProperties),
m_yaw(0), m_yaw(0),
m_last_sent_yaw(0), m_last_sent_yaw(0),
m_last_sent_position(0,0,0) m_last_sent_position(0,0,0),
m_last_sent_position_timer(0)
{ {
// Only register type if no environment supplied // Only register type if no environment supplied
if(env == NULL){ if(env == NULL){
@ -1561,6 +1562,8 @@ ServerActiveObject* LuaEntitySAO::create(ServerEnvironment *env, v3f pos,
void LuaEntitySAO::step(float dtime, bool send_recommended) void LuaEntitySAO::step(float dtime, bool send_recommended)
{ {
m_last_sent_position_timer += dtime;
if(m_registered){ if(m_registered){
lua_State *L = m_env->getLua(); lua_State *L = m_env->getLua();
scriptapi_luaentity_step(L, m_id, dtime); scriptapi_luaentity_step(L, m_id, dtime);
@ -1568,7 +1571,13 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
if(send_recommended == false) if(send_recommended == false)
return; return;
if(m_base_position.getDistanceFrom(m_last_sent_position) > 0.05*BS
float minchange = 0.2*BS;
if(m_last_sent_position_timer > 1.0)
minchange = 0.01*BS;
else if(m_last_sent_position_timer > 0.2)
minchange = 0.05*BS;
if(m_base_position.getDistanceFrom(m_last_sent_position) > minchange
|| fabs(m_yaw - m_last_sent_yaw) > 1.0){ || fabs(m_yaw - m_last_sent_yaw) > 1.0){
sendPosition(true); sendPosition(true);
} }
@ -1646,6 +1655,7 @@ void LuaEntitySAO::sendPosition(bool do_interpolate)
{ {
m_last_sent_yaw = m_yaw; m_last_sent_yaw = m_yaw;
m_last_sent_position = m_base_position; m_last_sent_position = m_base_position;
m_last_sent_position_timer = 0;
std::ostringstream os(std::ios::binary); std::ostringstream os(std::ios::binary);
// command (0 = update position) // command (0 = update position)

1
src/content_sao.h
View File

@ -229,6 +229,7 @@ private:
float m_yaw; float m_yaw;
float m_last_sent_yaw; float m_last_sent_yaw;
v3f m_last_sent_position; v3f m_last_sent_position;
float m_last_sent_position_timer;
}; };
#endif #endif

1
src/scriptapi.cpp
View File

@ -383,7 +383,6 @@ private:
ObjectRef *ref = checkobject(L, 1); ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref); ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0; if(co == NULL) return 0;
infostream<<"ObjectRef::l_getpos(): id="<<co->getId()<<std::endl;
v3f pos = co->getBasePosition() / BS; v3f pos = co->getBasePosition() / BS;
lua_newtable(L); lua_newtable(L);
lua_pushnumber(L, pos.X); lua_pushnumber(L, pos.X);