Commit Graph

379 Commits

Author SHA1 Message Date
sunzhenyu
87c52581f2 修改三维设备贴图配置bug 2020-05-22 09:32:09 +08:00
sunzhenyu
e0fd1ece86 修改车站贴图,修改驾驶提示 2020-05-21 16:48:59 +08:00
sunzhenyu
01f90f6a2d 隐藏三维站台 2020-05-20 10:50:13 +08:00
sunzhenyu
e40de65e9f 三维贴图加载日志清除 2020-05-19 18:12:42 +08:00
sunzhenyu
21beb69fcb 修改三维数据加载逻辑,增加贴图背景资源简易配置 2020-05-19 18:00:36 +08:00
sunzhenyu
6a25030a53 修改三维数据 2020-05-19 16:49:56 +08:00
sunzhenyu
92eed74c94 修改老数据地图三维设备显示交互功能 2020-05-13 14:34:17 +08:00
sunzhenyu
0b2948f4a0 修改增加继电器转辙机文本 2020-05-13 12:59:05 +08:00
sunzhenyu
1d3c00502a 三维设备展示页面转辙机界面样式逻辑修改 2020-05-12 18:34:09 +08:00
sunzhenyu
275e4bab27 修改三维设备页面道岔转辙机 2020-05-11 10:13:54 +08:00
sunzhenyu
eed9189d7a 继电器逻辑修改 2020-05-08 18:06:33 +08:00
sunzhenyu
3d6612cfbd 升级三维继电器动画模块 2020-04-30 18:19:32 +08:00
sunzhenyu
8f15f049f1 修改三维动画播放器重复更新bug,增加宁波线路三维背景,修改三维仿真行车逻辑改为后台数据控制 2020-04-24 18:00:12 +08:00
sunzhenyu
1cd2fd370b 复原三维沙盘行车逻辑 2020-04-22 13:22:54 +08:00
sunzhenyu
0ea6430617 修改三维驾驶操作面板,整合实用按钮,修改背景 2020-04-21 18:31:33 +08:00
sunzhenyu
b8eec513ae 修改三维编辑轨道bug 2020-04-20 17:31:42 +08:00
sunzhenyu
47a8c63c5d 修改三维新版轨道结构,新版地图数据三维轨道编辑功能修改 2020-04-17 16:09:37 +08:00
sunzhenyu
2b0ee65a67 新数据三维区段模型自动生成修改,哈尔滨背景模型修改 2020-04-10 18:55:06 +08:00
sunzhenyu
01842a7605 修改三维轨迹线显示 2020-04-10 16:54:32 +08:00
sunzhenyu
ee0b0ba391 添加三维驾驶界面mmi站台,安全距离,行车登记,驾驶模式显示视图 2020-04-10 16:13:36 +08:00
sunzhenyu
c3de769691 限制驾驶视角 2020-04-03 17:21:00 +08:00
sunzhenyu
7429fc47bb 修改三维仿真驾驶站台和轨道 2020-04-03 16:55:59 +08:00
sunzhenyu
76d17b380e 修改三维车站屏蔽门动画 2020-04-03 15:08:17 +08:00
sunzhenyu
50eb7c2315 修改三维驾驶和仿真模型,增加隧道背景 2020-04-02 18:48:04 +08:00
sunzhenyu
12b4599e39 注释 2020-04-01 17:09:47 +08:00
sunzhenyu
e401081214 修改三维设备模型道岔动画时间 2020-04-01 16:53:07 +08:00
sunzhenyu
d7fd261c07 修改三维客流视图画面 2020-04-01 16:03:09 +08:00
sunzhenyu
97a829598b 修改三维驾驶车组号显示 2020-04-01 09:14:33 +08:00
sunzhenyu
6ae459b910 merge 2020-03-31 18:52:05 +08:00
sunzhenyu
ec0f59682b merge 2020-03-31 18:45:00 +08:00
sunzhenyu
3bbd28c17b 限制只有新数据有驾驶面板 2020-03-31 18:42:38 +08:00
sunzhenyu
d4f7da9c8b 添加驾驶操作面板,三维模型资源改本地 2020-03-31 18:30:15 +08:00
fan
d7b8879c8d 调整 2020-03-31 11:25:04 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
fan
ab4928d924 差异化打包调整&哈尔滨登录页 2020-03-30 13:07:11 +08:00
sunzhenyu
9de8b430ee 修改三维沙盘和三维驾驶行车逻辑,设备动画逻辑,通信逻辑 2020-03-25 18:47:14 +08:00
sunzhenyu
e445223a2e 注释 2020-03-20 17:00:41 +08:00
sunzhenyu
0b6415b162 修改三维设备视图,修改站台模型贴图,修改客流量加载页面 2020-03-20 17:00:12 +08:00
sunzhenyu
2760a4a678 修改三维客流视图加载界面,修改仿真站台模型 2020-03-20 09:55:13 +08:00
sunzhenyu
1a4bc63382 修改继电器模型H18的大小,更改继电器界面背景 2020-03-18 15:12:30 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
sunzhenyu
896fc027a9 修改三维编辑加载 2020-03-16 13:32:20 +08:00
sunzhenyu
39f334b049 修改三维模型数据 2020-03-12 18:40:02 +08:00
sunzhenyu
098c997912 新数据三维驾驶读取场景 2020-03-11 18:39:20 +08:00
sunzhenyu
e80a864018 新数据三维仿真行车优化通车 2020-03-11 14:33:46 +08:00
sunzhenyu
d3d1909a82 新数据三维仿真优化 2020-03-10 18:57:13 +08:00
sunleking
a87d551751 修改三维仿真停车点 2020-03-08 23:10:57 +08:00
sunleking
674674bf86 修改三维仿真通信结构优化代码 2020-03-08 19:40:46 +08:00
sunleking
7b7345123b 三维编辑器加载模型修改 2020-03-02 08:52:58 +08:00
sunleking
3850d57b4e 加入站台,闸机动画。修改人物路线,拆分进出闸机模型 2020-02-21 19:10:45 +08:00
sunleking
7eda57b08c 三维客流模拟加入监控多视角,拆分模型加载 2020-02-20 18:00:27 +08:00
sunleking
338f9a75e8 三维客流视图追加人物模型动画 2020-02-18 17:55:29 +08:00
sunleking
61394c4b39 增加三维客流量模块,目前完成了基础的行走状态控制流程 2020-02-14 18:22:11 +08:00
sunzhenyu
d6cd6c1e3e 注释 2020-01-20 18:08:23 +08:00
sunzhenyu
cfd2c3b974 修复继电器动画错位bug 2020-01-19 18:56:43 +08:00
sunzhenyu
ceb9b06c2f 修改重复创建三维行车bug,去除继电器网格,新数据测试 2020-01-19 18:09:34 +08:00
sunzhenyu
d32820e1b4 修改三维背景bug,修改继电器模型和显示,继电器地址,修改三维地图站台偏差 2020-01-16 17:04:16 +08:00
sunzhenyu
0113ac7154 新数据在仿真中的重建,修复背景图不显示bug 2020-01-15 18:32:55 +08:00
sunzhenyu
e19e44835f 修改背景自适应,修改三维地图编辑逻辑存读以及三维沙盘加载 2020-01-14 16:09:08 +08:00
sunzhenyu
0fdc84330c 修改三维自动section逻辑 2020-01-09 11:19:02 +08:00
sunzhenyu
7acd86d332 修改继电器显示逻辑 2020-01-07 10:51:19 +08:00
sunzhenyu
60e1750611 增加继电器数量 2020-01-07 10:41:21 +08:00
sunzhenyu
f1f21006fe 修改继电器通信,修改新数据三维化部分操作 2020-01-07 09:27:41 +08:00
sunzhenyu
505e9a0da4 修改区段数值匹配 2020-01-03 19:01:34 +08:00
sunzhenyu
71cadb56e8 修改编辑器轨道匹配逻辑 2020-01-03 16:56:36 +08:00
sunzhenyu
432aff42a3 修改仿真驾驶换车错位 2019-12-31 18:20:53 +08:00
sunzhenyu
465520368b 修改新数据读取逻辑 2019-12-31 15:13:29 +08:00
sunzhenyu
c387c3836f 修改数字沙盘行车逻辑bug,逻辑改为目的地link判断是否行使,修正初始列车坐标赋值 2019-12-27 18:10:14 +08:00
sunzhenyu
76379f12cc 继电器通信,修改继电器逻辑,继电器模型动画更替,修改设备信号灯逻辑,修改设备道岔初始化bug 2019-12-26 10:41:07 +08:00
sunzhenyu
536cbb4e60 剔除三维无用静态模型,修改模型配置 2019-12-19 09:40:29 +08:00
sunzhenyu
04d1ab8d59 link轨道模型合并测试,司机驾驶非驾驶车辆没附加linkcodebug修改 2019-12-17 19:09:04 +08:00
sunzhenyu
daff5faaa5 整理注释继电器代码 2019-12-13 17:53:22 +08:00
sunzhenyu
e8cc316e82 增加继电器部件显示 2019-12-13 15:57:38 +08:00
sunzhenyu
4ed2b9b371 修改继电器动画选择设备复位 2019-12-13 09:31:59 +08:00
sunzhenyu
a9a62b924f 添加继电器界面动画,修改继电器显示模式 2019-12-13 09:14:28 +08:00
sunzhenyu
5992e1a0ae 修改三维模块名称,升级threejs版本 2019-12-11 10:47:24 +08:00
sunzhenyu
a6c9db1904 修改仿真驾驶添加模型错误,修改沙盘漫游动画轨迹,修改沙盘图标显示,清除不使用的天空盒文件 2019-12-06 18:04:15 +08:00
sunzhenyu
e97dc7b8c0 注释 2019-12-05 16:26:47 +08:00
sunzhenyu
7831bce219 添加仿真设备视图 2019-12-05 16:04:36 +08:00
sunzhenyu
c35a5af565 修改沙盘渲染方式,修改图标名称 2019-12-03 14:19:22 +08:00
sunzhenyu
6f081ca234 修改沙盘行车逻辑,增加站台模型,修改webworker通信,优化通信判断 2019-12-03 13:48:15 +08:00
ival
966dc20c3d Merge branch 'test' of https://git.qcloud.com/joylink/jl-nclient into test 2019-11-19 11:01:54 +08:00
ival
0186f25a2b Merge branch 'dev' into test
# Conflicts:
#	src/api/jlmap3d/load3ddata.js
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
2019-11-19 11:00:13 +08:00
ival
50e9a242e7 修改代码 2019-11-18 14:44:01 +08:00
sunzhenyu
e2405eba15 修改信号机判断逻辑 2019-11-15 18:40:45 +08:00
sunzhenyu
576e41b64d 注释 2019-11-15 17:47:07 +08:00
sunzhenyu
03c97eefef 修改三维订阅接口 2019-11-15 17:34:07 +08:00
sunzhenyu
f7b909f85d 修改连接 2019-11-15 17:24:13 +08:00
sunzhenyu
495cecb06c Merge branch 'test' of git.cloud.tencent.com:joylink/jl-nclient into test 2019-11-15 16:47:47 +08:00
sunzhenyu
3138187c07 减少合并三维行车判断逻辑,分拆三维行车数据对象 2019-11-15 16:47:34 +08:00
fan
1c75c8f0ef Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/jlmap3d/jl3ddrive/moveupdate/DrivingConnect.js
#	src/jlmap3d/jl3dsimulation/connect/TrainingConnect.js
2019-11-15 16:42:32 +08:00
ival
c5c813753c 修改代码 2019-11-14 13:59:33 +08:00
sunzhenyu
1cda6fcd49 修改仿真驾驶按计划行车转移镜头 2019-11-13 18:51:31 +08:00
sunzhenyu
fe180bf793 模拟驾驶加入退出计划,合并部分判断 2019-11-13 18:33:31 +08:00
sunzhenyu
498da8c434 注释 2019-11-12 19:04:09 +08:00
sunzhenyu
74c0df432f 修改三维行车位置发送逻辑 2019-11-12 19:02:54 +08:00
sunzhenyu
c51bb4c7c6 注释 2019-11-12 18:52:13 +08:00
sunzhenyu
34bc6ed463 修改行车逻辑,修改站台,轨迹数据结构,更替模型 2019-11-12 18:19:12 +08:00
ival
8eb4ac80a6 修改刷新问题 2019-11-12 17:27:30 +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
8e11c76cd7 测试站台停车坐标 2019-11-08 14:31:15 +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
2a39905de3 修改仿真渲染设置 2019-10-31 13:57:29 +08:00
sunzhenyu
675dc32516 注释 2019-10-31 13:38:40 +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
aa02794959 修改列车速度,自动驾驶路径判断修改 2019-10-23 16:35:56 +08:00
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