Commit Graph

313 Commits

Author SHA1 Message Date
sunzhenyu
5aa564d00a 修改驾驶模型渲染范围,修改行车速度 2019-10-22 18:35:56 +08:00
sunzhenyu
61b9c9705c 设置模型路径 2019-10-22 17:33:17 +08:00
sunzhenyu
388d647ba3 修改通信消息判断顺序 2019-10-22 15:41:39 +08:00
sunzhenyu
b5a822afea 增加webworker停止 2019-10-21 17:59:48 +08:00
sunzhenyu
394baf72a7 模型测试 2019-10-21 14:09:19 +08:00
sunzhenyu
5c79ab8216 去掉辅助线 2019-10-18 15:43:00 +08:00
sunzhenyu
45c2954f53 注释 2019-10-18 15:30:26 +08:00
sunzhenyu
a7e7988754 修复路径判断 2019-10-18 15:29:17 +08:00
sunzhenyu
9bd43b2ee2 修改模型路径 2019-10-17 18:56:25 +08:00
sunzhenyu
f847629b92 修改文字显示,行车路径,行车计算 2019-10-17 18:48:36 +08:00
sunzhenyu
6fa90f5c79 修改行车逻辑 2019-10-15 19:03:21 +08:00
sunzhenyu
1ddb55091a 修改行车逻辑 2019-10-14 18:18:11 +08:00
sunzhenyu
8b71f08de0 修改行车逻辑 2019-10-12 19:03:21 +08:00
sunzhenyu
b32b03bc81 修改link为主轨迹运行 2019-10-12 16:36:51 +08:00
sunzhenyu
0e251fc8cb 测试 2019-10-09 17:00:58 +08:00
sunzhenyu
2defa3c89d 仿真载入新数据 2019-10-09 14:31:11 +08:00
sunzhenyu
2c5284b6c4 增加信号机位置重置 2019-09-30 18:38:42 +08:00
sunzhenyu
2551a4d595 Merge branch 'dev' into 3dtest 2019-09-29 16:13:21 +08:00
sunzhenyu
aace4f9337 修改列车进站和转换区段速度 2019-09-29 14:05:33 +08:00
sunzhenyu
3dccd86682 修改自动轨道link 2019-09-29 09:21:38 +08:00
sunzhenyu
ba4c041468 修改道岔生成 2019-09-27 18:46:27 +08:00
sunzhenyu
af17dbece4 新数据存读 2019-09-25 14:49:25 +08:00
sunzhenyu
103929b23f 修改区段坐标,增加道岔,信号机,站台位置 2019-09-20 19:03:01 +08:00
sunzhenyu
3dfa7d6000 隧道,信号机自动部署测试 2019-09-19 18:55:18 +08:00
sunzhenyu
71a33b5042 merge 2019-09-19 09:25:04 +08:00
sunzhenyu
b2f1bfae58 加入正常铁轨,测试隧道,隧道需要根据section再生成待修改 2019-09-18 16:07:40 +08:00
sunzhenyu
dfef5a28e9 修改三维界面声音返回和退出播放bug,更换音轨 2019-09-18 13:20:08 +08:00
sunzhenyu
9fd032372c 修改下行方向初始轨迹,修改音频大小 2019-09-17 10:50:59 +08:00
sunzhenyu
3e2b812029 修改列车初始化获取轨迹和位置代码,修改倒车卡轨迹bug,增加跟速度相关的轨道声音 2019-09-16 18:47:15 +08:00
sunzhenyu
33442d2969 自动化test 2019-09-11 18:12:52 +08:00
sunzhenyu
fd8f3e4dd0 修改过去不标准贴图,修改代码生成的不标准材质 2019-09-09 10:22:10 +08:00
sunzhenyu
9211396f99 修改state 2019-09-03 17:01:00 +08:00
sunzhenyu
6fc5f991ef 区分cctv和正常镜头渲染,减少通信驱动的循环体,减少循环遍历的数据中内容,修改场景背景 2019-09-03 16:45:56 +08:00
sunzhenyu
ad5853498f pull 2019-09-02 10:19:45 +08:00
ival
1f82f68cd1 Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
2019-08-30 18:47:51 +08:00
ival
eb5f71febd Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
#	src/utils/baseUrl.js
#	static/model/suidao/suidao.FBX
2019-08-30 09:23:40 +08:00
sunzhenyu
6c325be953 修改模型地址 2019-08-29 17:15:13 +08:00
sunzhenyu
02fb10040c 修改资源地址 2019-08-29 11:16:22 +08:00
sunzhenyu
7862af3284 减少列车刷新 2019-08-29 11:12:02 +08:00
sunzhenyu
164572fb02 更新 2019-08-29 11:11:15 +08:00
sunzhenyu
06c29a97c4 修改驾驶中相机对象引用错误 2019-08-29 11:04:10 +08:00
sunzhenyu
0a30f6b5f7 减少行车循环中的无用判断,修改fbx模型加载,增加双面效果 2019-08-28 18:20:49 +08:00
sunzhenyu
539f006e1e 修改下行轨道初始同步位置 2019-08-27 18:47:25 +08:00
sunzhenyu
ba1e83f821 修改站台数据读取 2019-08-27 18:17:58 +08:00
sunzhenyu
b405494785 修改初始坐标 2019-08-27 18:14:10 +08:00
sunzhenyu
2ceb795114 修改站台加载 2019-08-27 17:07:17 +08:00
sunzhenyu
f2f89d2be2 修改初始位置因为角度偏移问题 2019-08-26 18:56:46 +08:00
sunzhenyu
1fb6353f98 增加测试版车载cctv 2019-08-20 18:30:17 +08:00
sunzhenyu
ab23d7932a 修改mmi接收操作模拟器消息 2019-08-16 18:38:35 +08:00
ival
3bb449080f Merge remote-tracking branch 'remotes/origin/master' into dev
# Conflicts:
#	src/i18n/langs/zh/tip.js
#	src/jlmap3d/jl3ddrive/jl3ddrive.js
#	src/views/components/pay/index.vue
#	src/views/demonstration/detail/index.vue
#	src/views/display/index.vue
#	src/views/exam/detail/courseDetail.vue
#	src/views/exam/detail/examDetail.vue
#	src/views/exam/detail/questionDetail.vue
#	src/views/jlmap3d/drive/jl3ddrive.vue
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
#	src/views/jointTraining/index.vue
#	src/views/map/mapdraft/mapedit/automaticoperate/preview.vue
#	src/views/map/mapdraft/mapedit/mapoperate/link.vue
#	src/views/map/mapdraft/mapedit/mapoperate/section.vue
#	src/views/map/mapdraft/mapedit/mapoperate/signal.vue
#	src/views/map/mapdraft/mapedit/mapoperate/station.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationcontrol.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stationstand.vue
#	src/views/map/mapdraft/mapedit/mapoperate/stoppoint.vue
#	src/views/map/mapdraft/mapedit/mapoperate/switch.vue
#	src/views/map/mapdraft/mapedit/pathoperate/pathRoute.vue
#	src/views/map/mapdraft/mapedit/routeoperate/detail.vue
#	src/views/map/mapdraft/mapedit/routeoperate/preview.vue
#	src/views/map/mapdraft/mapedit/routeoperate/related.vue
#	src/views/map/mapdraft/mapedit/routeoperate/route.vue
#	src/views/map/mapdraft/mapmanage/operateMenu.vue
#	src/views/map/product/draft.vue
#	src/views/map/product/list.vue
#	src/views/map/skinStyle/draft.vue
#	src/views/map/skinStyle/index.vue
#	src/views/planMonitor/detail.vue
#	src/views/planMonitor/editTool/index.vue
#	src/views/planMonitor/editTool/menus/modifyingStationIntervalTime.vue
#	src/views/planMonitor/editTool/schedule.vue
#	src/views/teach/detail/index.vue
#	src/views/teach/practical/index.vue
2019-08-14 15:57:52 +08:00
ival
78a805cd2f 修改皮肤skinStyle为skinCode 2019-08-14 09:35:38 +08:00
ival
db109f2a9e 调整地图进路相关的接口 2019-08-13 16:59:38 +08:00
sunzhenyu
39002937e1 调整文件结构 2019-08-13 16:23:46 +08:00
sunzhenyu
74527e79fe 修改三维view文件结构 2019-08-12 18:37:43 +08:00
sunzhenyu
de7ee56d77 删除不用资源 2019-08-12 13:42:53 +08:00
sunzhenyu
2aa7bfd759 修改js挂载 2019-08-08 14:19:03 +08:00
sunzhenyu
9f9236361a 修改threejs挂载 2019-08-08 10:52:06 +08:00
sunzhenyu
5899fe1347 修改界面自适应 2019-08-07 11:28:46 +08:00
sunzhenyu
7edaf938c7 Merge branch 'master' of git.cloud.tencent.com:joylink/jl-nclient 2019-08-06 17:28:17 +08:00
sunzhenyu
c27aed050f 挂载threejs,添加静态文件插件 2019-08-06 14:10:21 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
zyy
82c49c97e2 调整代码 2019-07-30 15:52:30 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00