1
This commit is contained in:
parent
e11a776f01
commit
250c19a1b1
@ -12,6 +12,8 @@
|
|||||||
#include "incubator.h"
|
#include "incubator.h"
|
||||||
#include "frameeventdata.h"
|
#include "frameeventdata.h"
|
||||||
|
|
||||||
|
#include "mt/AirLine.h"
|
||||||
|
|
||||||
void FrameMaker::Debug_FullObject(Human* hum)
|
void FrameMaker::Debug_FullObject(Human* hum)
|
||||||
{
|
{
|
||||||
#if 0
|
#if 0
|
||||||
@ -130,6 +132,7 @@ void FrameMaker::PreProcess(cs::SMUpdate* msg, Room* room, Human* hum, FrameData
|
|||||||
TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
|
TypeConvert::ToPb(hum->room->plane.start_point, p->mutable_start_point());
|
||||||
TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
|
TypeConvert::ToPb(hum->room->plane.end_point, p->mutable_end_point());
|
||||||
TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
|
TypeConvert::ToPb(hum->room->plane.curr_pos, p->mutable_pos());
|
||||||
|
p->set_plane_speed(room->GetAirLine()->plane_speed());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -210,6 +210,7 @@ public:
|
|||||||
bool CanAddObstacle(const glm::vec3& pos, int obstacle_id);
|
bool CanAddObstacle(const glm::vec3& pos, int obstacle_id);
|
||||||
void AddTask(int task_uniid, ITask* task);
|
void AddTask(int task_uniid, ITask* task);
|
||||||
void RemoveTask(int task_uniid);
|
void RemoveTask(int task_uniid);
|
||||||
|
const mt::AirLine* GetAirLine() { return airline_; };
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ShuaAndroid();
|
void ShuaAndroid();
|
||||||
|
@ -798,6 +798,7 @@ message MFPlane
|
|||||||
optional MFVec3 start_point = 1; //飞机起点
|
optional MFVec3 start_point = 1; //飞机起点
|
||||||
optional MFVec3 end_point = 2; //飞机终点
|
optional MFVec3 end_point = 2; //飞机终点
|
||||||
optional MFVec3 pos = 3; //飞机当前位置
|
optional MFVec3 pos = 3; //飞机当前位置
|
||||||
|
optional float plane_speed = 4; //飞机速度(像素/秒)
|
||||||
}
|
}
|
||||||
|
|
||||||
//载具信息(用于小地图显示)
|
//载具信息(用于小地图显示)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user