Merge branch 'master' into dev

This commit is contained in:
tengge 2020-07-25 23:31:12 +08:00
commit 90aff83b99
2 changed files with 122 additions and 29 deletions

View File

@ -39,22 +39,88 @@ English / [中文](README_zh.md) &nbsp;&nbsp; | &nbsp;&nbsp; <a href="https://gi
Note: If the desktop version cannot be opened, you can view `logs.txt`; if the port conflicts, you can modify the MongoDB and website ports in `resources/app/config.toml`.
## Features
## Feature List
1. Cross-platform: `Windows`, `Linux`, `Mac`; and supports desktop and web versions.
2. It supports many 3D formats: `3ds`, `3mf`, `amf`, `assimp`(anim), `awd`, `babylon`, `binary`, `bvh`(anim), `collada`, `ctm`, `draco` , `fbx`(anim), `gcode`, `gltf`(`gltf` and `glb`, anim), `js`(anim), `kmz`, `lmesh`(anim), `md2`, `mmd`(`pmd` and `pmx`, anim), `nrrd`, `obj`, `pcd`, `pdb`, `ply`, `prwm`, `sea3d`(anim), `stl`, `vrm`, `vrml`, `vtk`, `X`. (anim) means it supports animation.
3. Built-in objects: group; plane, cube, circle, cylinder, sphere, icosahedron, torus, torus knot, teapot, lathe; unscaled text, 3D text; line segments, CatmullRom curve, quadratic Bezier curve, cubic Bezier curve, ellipse curve; point marks; arrow helper, axes helper; sprite.
4. Built-in lights: ambient light, directional light, point light, spotlight, hemispherical light, rect area light.
5. Built-in components: background music, particle emitter, sky, fire, water, smoke, cloth, berlin terrain, sky sphere.
6. Support materials: LineBasicMaterial, LineDashedMaterial, MeshBasicMaterial, MeshDepthMaterial, MeshNormalMaterial, MeshLambertMaterial, MeshPhongMaterial, PointsMaterial, MeshStandardMaterial, MeshPhysicalMaterial, SpriteMaterial, ShaderMaterial, RawShaderMaterial.
7. Edit javascript, shader program and json with intelligence.
8. Live player can play animations in the scene.
9. Exporting `gltf`, `obj`, `ply`, `stl`, `Collada`, `DRACO` models.
10. Publish scene as static resources, and can be embedded in `iframe`.
11. Support languages: `English`, `中文`, `繁體中文`, `日本語`, `한국어`, `русский`, `Le français`.
12. Scene version management: supporting history and logs, undo and redo, auto saving.
13. Authority management: organization, user, role, authority, registration, login, and password modification.
14. Resource management: scene, mesh, texture, material, audio, animation, screenshot, video, typeface.
- [x] General
- [x] Cross-platform
- [x] Windows, Linux, Mac
- [x] Desktop, Web
- [x] Multi-language support
- [x] English、中文、繁體中文、日本語、한국어、русский、Le français
- [x] Assets management
- [x] scene, mesh, texture, material, audio, animation, screenshot, video, typeface
- [x] Authority management
- [x] organization, user
- [x] role, authority
- [x] registration, login, password modification
- [x] Version management
- [x] Scene history and logs
- [x] undo, redo, auto saving
- [x] Player
- [x] play animations in the scene in real time
- [x] Small scene editing
- [x] Add mesh
- [x] 3ds, 3mf, amf, assimp, awd, babylon, binary, bvh, collada, ctm
- [x] draco, fbx, gcode, gltf, glb, js, kmz, lmesh, md2, pmd, pmx
- [x] nrrd, obj, pcd, pdb, ply, prwm, sea3d, stl, vrm, vrml, vtk, X
- [x] Built-in objects
- [x] group
- [x] plane, cube, circle, cylinder, sphere, icosahedron, torus, torus knot, teapot, lathe
- [x] unscaled text, 3D text
- [x] line segments, CatmullRom curve, quadratic Bezier curve, cubic Bezier curve, ellipse curve
- [x] point marks
- [x] arrow helper, axes helper
- [x] sprite
- [x] Built-in lights
- [x] ambient light, directional light, point light, spotlight, hemispherical light, rect area light
- [x] directional light, point light, spotlight, hemispherical light, rect area light helper
- [x] Built-in components
- [x] background music, particle emitter
- [x] sky, fire, water, smoke, cloth
- [x] berlin terrain, sky sphere
- [x] Materials editing
- [x] LineBasicMaterial, LineDashedMaterial, MeshBasicMaterial, MeshDepthMaterial, MeshNormalMaterial
- [x] MeshLambertMaterial, MeshPhongMaterial, PointsMaterial, MeshStandardMaterial, MeshPhysicalMaterial
- [x] SpriteMaterial, ShaderMaterial, RawShaderMaterial
- [x] Text editing
- [x] javascript editing with intelligence
- [x] shader editing
- [x] json file editing
- [x] Mesh export
- [x] gltf、obj、ply、stl、Collada、DRACO
- [x] Scene publishment
- [x] Publish scene as static resources, and can be embedded in iframe
- [ ] GIS scene editing
- [ ] Satellite imagery
- [x] Bing satellite image
- [ ] Google satellite image
- [ ] Tianditu satellite image
- [ ] 3D terrain
- [ ] Arcgis Elevation
- [ ] Terrain editing
- [ ] Ground features editing
- [ ] Pipe network editing
- [ ] District editing
- [ ] Data import
- [ ] OSM
- [ ] Sharp
- [ ] dxf
- [ ] Excel
- [ ] BIM
- [ ] Point cloud
- [ ] Data visualization
- [ ] Real-time data access
- [ ] WebSocket
- [ ] Ajax
- [ ] UI
- [ ] Form
- [ ] Button, radio, checkbox, dropdown
- [ ] Panel
- [ ] Datagrid
- [ ] Chart
- [ ] Histogram
- [ ] Pie chart
- [ ] Line chart
## Requirements

View File

@ -39,23 +39,25 @@
说明:如果桌面版打不开,可以查看`logs.txt`;如果端口冲突,可以修改`resources/app/config.toml`中的MongoDB和网站端口。
## 功能特点
## 功能清单
- [x] 通用功能
- [x] 跨平台
- [x] Windows、Linux、Mac
- [x] 桌面版、Web版
- [x] 多语言支持
- [x] `English``中文``繁體中文``日本語``한국어``русский``Le français`
- [x] English、中文、繁體中文、日本語、한국어、русский、Le français
- [x] 资源管理
- [x] 场景、模型、贴图、材质、音频、动画、截图、录制视频、字体
- [x] 权限管理
- [x] 组织机构、用户、角色、权限、注册、登录、修改密码
- [x] 组织机构、用户
- [x] 角色、权限
- [x] 注册、登录、修改密码
- [x] 版本控制
- [x] 场景历史记录
- [x] 支持历史记录和日志、撤销和重做,自动保存
- [x] 场景历史记录、操作日志
- [x] 撤销、重做、自动保存
- [x] 播放器
- [x] 实时播放器可以播放场景中的动画
- [x] 实时播放场景中的动画
- [x] 小场景编辑
- [x] 添加模型
- [x] 3ds, 3mf, amf, assimp, awd, babylon, binary, bvh, collada, ctm
@ -71,29 +73,54 @@
- [x] 精灵
- [x] 内置光源
- [x] 环境光、平行光、点光源、聚光灯、半球光、矩形光
- [x] 平行光、点光源、聚光灯、半球光、矩形光帮助器
- [x] 内置组件
- [x] 背景音乐、粒子发射器、天空、火焰、水、烟、布、柏林地形、天空球
- [x] 背景音乐、粒子发射器
- [x] 天空、火焰、水、烟、布
- [x] 柏林地形、天空球
- [x] 材质编辑
- [x] 线条材质、虚线材质、基本材质、深度材质、法向量材质
- [x] 兰伯特材质、冯氏材质、点云材质、标准材质、物理材质
- [x] 精灵材质、着色器材质、原始着色器材质
- [x] 脚本、着色器、json编辑智能提示
- [x] 文本编辑
- [x] js脚本编辑带智能提示
- [x] 着色器编辑
- [x] json文件编辑
- [x] 模型导出
- [x] 导出`gltf``obj``ply``stl``Collada``DRACO`模型
- [x] gltf、obj、ply、stl、Collada、DRACO
- [x] 场景发布
- [x] 将场景发布成静态资源,可以嵌入`iframe`
- [x] 将场景发布成静态资源可以嵌入iframe中
- [ ] GIS场景编辑
- [ ] 地形编辑
- [ ] 卫星图
- [x] 必应卫星图
- [ ] 谷歌卫星图
- [ ] 天地图卫星图
- [ ] 三维地形
- [ ] Arcgis地形
- [ ] 地形编辑
- [ ] 地物编辑
- [ ] 管网编辑
- [ ] 小区编辑
- [ ] 数据导入
- [ ] 多种卫星图支持
- [ ] 管网编辑
- [ ] 小区编辑
- [ ] OSM数据
- [ ] Sharp数据
- [ ] dxf数据
- [ ] Excel数据
- [ ] BIM数据
- [ ] 点云数据
- [ ] 数据可视化
- [ ] 实时数据接入
- [ ] WebSocket数据
- [ ] Ajax数据
- [ ] UI
- [ ] Form
- [ ] 按钮、单选框、复选框、下拉列表
- [ ] 面板
- [ ] 表格
- [ ] 可视化图表
- [ ] 柱状图
- [ ] 饼状图
- [ ] 折线图
## 需求