Commit Graph

107 Commits

Author SHA1 Message Date
sunzhenyu
5992e1a0ae 修改三维模块名称,升级threejs版本 2019-12-11 10:47:24 +08:00
sunzhenyu
c35a5af565 修改沙盘渲染方式,修改图标名称 2019-12-03 14:19:22 +08:00
sunzhenyu
6f081ca234 修改沙盘行车逻辑,增加站台模型,修改webworker通信,优化通信判断 2019-12-03 13:48:15 +08:00
sunzhenyu
e2405eba15 修改信号机判断逻辑 2019-11-15 18:40:45 +08:00
sunzhenyu
3138187c07 减少合并三维行车判断逻辑,分拆三维行车数据对象 2019-11-15 16:47:34 +08:00
sunzhenyu
c51bb4c7c6 注释 2019-11-12 18:52:13 +08:00
sunzhenyu
34bc6ed463 修改行车逻辑,修改站台,轨迹数据结构,更替模型 2019-11-12 18:19:12 +08:00
sunzhenyu
e36ef1b3da 三维行车测试 2019-11-11 18:32:03 +08:00
sunzhenyu
f5de76ff63 测试 2019-11-11 15:16:18 +08:00
sunzhenyu
e805a97a6d 修改转换数据计算 2019-11-08 19:33:43 +08:00
sunzhenyu
957f13fd2f 行车逻辑测试 2019-11-08 18:42:37 +08:00
sunzhenyu
523a2ac803 修改道岔模型,编辑器显示停车点 2019-11-08 09:16:14 +08:00
sunzhenyu
0a77b1e4f6 注释 2019-11-06 13:34:52 +08:00
sunzhenyu
3e3cb9bfd2 对齐站台隧道 2019-11-06 12:18:50 +08:00
sunzhenyu
57235b8965 修改路径判定 2019-11-05 18:26:12 +08:00
sunzhenyu
a340496eac 修改模型路径,修改轨迹判定 2019-11-05 17:30:39 +08:00
sunzhenyu
4532446048 修改路劲判断函数,区分仿真和沙盘加载显示内容,测试站台模型 2019-11-04 18:57:35 +08:00
sunzhenyu
3d9a458d42 修改三维数据接口,修改渲染范围 2019-10-31 13:26:40 +08:00
sunzhenyu
26f0b6dde0 修改行车逻辑,减少画面渲染 2019-10-31 13:06:56 +08:00
sunzhenyu
300aa624df 更换threejs到109版本,修改路劲弧度,修改渲染注册,测试光效 2019-10-25 18:42:56 +08:00
sunzhenyu
61b9c9705c 设置模型路径 2019-10-22 17:33:17 +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
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
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
b2f1bfae58 加入正常铁轨,测试隧道,隧道需要根据section再生成待修改 2019-09-18 16:07:40 +08:00
sunzhenyu
fd8f3e4dd0 修改过去不标准贴图,修改代码生成的不标准材质 2019-09-09 10:22:10 +08:00
sunzhenyu
6fc5f991ef 区分cctv和正常镜头渲染,减少通信驱动的循环体,减少循环遍历的数据中内容,修改场景背景 2019-09-03 16:45:56 +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
164572fb02 更新 2019-08-29 11:11:15 +08:00
sunzhenyu
0a30f6b5f7 减少行车循环中的无用判断,修改fbx模型加载,增加双面效果 2019-08-28 18:20:49 +08:00
sunzhenyu
ba1e83f821 修改站台数据读取 2019-08-27 18:17:58 +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
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
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
c27aed050f 挂载threejs,添加静态文件插件 2019-08-06 14:10:21 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00