yuliang
/
yvan-rcs-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Way

master
修宁 7 months ago
parent
56f934a877
commit
43ef2f8249
5 changed files with 65 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/core/engine/SceneHelp.ts
  2. 37
      src/core/engine/Viewport.ts
  3. 7
      src/editor/menus/FileMenu.ts
  4. 90
      src/example/example1.js
  5. 4
      src/modules/way/WayRenderer.ts

17
src/core/engine/SceneHelp.ts
View File

@ -33,6 +33,7 @@ export default class SceneHelp {
if (gridOption.axesEnabled) { if (gridOption.axesEnabled) {
this.axesHelper = createAxes(gridOption.axesSize, gridOption.axesColor, gridOption.axesWidth) this.axesHelper = createAxes(gridOption.axesSize, gridOption.axesColor, gridOption.axesWidth)
this.axesHelper.position.setY(0.03) // 确保网格在地面上方
this.scene.add(this.axesHelper) this.scene.add(this.axesHelper)
} }
@ -40,7 +41,7 @@ export default class SceneHelp {
gridHelper.material.color.setHex(gridOption.gridColor) gridHelper.material.color.setHex(gridOption.gridColor)
gridHelper.material.opacity = gridOption.gridOpacity gridHelper.material.opacity = gridOption.gridOpacity
gridHelper.material.transparent = true gridHelper.material.transparent = true
// @ts-ignore gridHelper.position.setY(0.02) // 确保网格在地面上方
gridHelper.material.vertexColors = false gridHelper.material.vertexColors = false
if (!gridOption.gridEnabled) { if (!gridOption.gridEnabled) {
gridHelper.visible = false gridHelper.visible = false
@ -49,6 +50,16 @@ export default class SceneHelp {
this.gridHelper = gridHelper this.gridHelper = gridHelper
this.scene.add(this.gridHelper) this.scene.add(this.gridHelper)
const gridHelper2 = new THREE.GridHelper(1000, 100)
gridHelper2.material.color.setHex(gridOption.gridColor)
gridHelper2.material.transparent = false
gridHelper2.material.vertexColors = false
gridHelper2.position.setY(0.01) // 确保网格在地面上方
if (!gridOption.gridEnabled) {
gridHelper2.visible = false
}
this.scene.add(gridHelper2)
// 光照 // 光照
const ambientLight = new THREE.AmbientLight(0xffffff, 0.8) const ambientLight = new THREE.AmbientLight(0xffffff, 0.8)
this.scene.add(ambientLight) this.scene.add(ambientLight)
@ -56,10 +67,10 @@ export default class SceneHelp {
// const directionalLight = new THREE.DirectionalLight(0xffffff, 1.5) // const directionalLight = new THREE.DirectionalLight(0xffffff, 1.5)
// directionalLight.position.set(5, 5, 5).multiplyScalar(3) // directionalLight.position.set(5, 5, 5).multiplyScalar(3)
// directionalLight.castShadow = true // directionalLight.castShadow = true
// scene.add(directionalLight) // this.scene.add(directionalLight)
// //
// const hemisphereLight = new THREE.HemisphereLight(0xffffff, 0x444444, 1) // const hemisphereLight = new THREE.HemisphereLight(0xffffff, 0x444444, 1)
// scene.add(hemisphereLight) // this.scene.add(hemisphereLight)
} }
// /** // /**

37
src/core/engine/Viewport.ts
View File

@ -158,12 +158,12 @@ export default class Viewport {
$(statsControls.dom).children().css('height', '28px') $(statsControls.dom).children().css('height', '28px')
// 监听事件 // 监听事件
// this.watchList.push(watch(() => this.state.camera.position.y, (newVal) => { this.watchList.push(watch(() => this.state.camera.position.y, (newVal) => {
// if (!this.state.isReady) { if (!this.state.isReady) {
// return return
// } }
// this.updateGridVisibility() this.updateGridVisibility()
// })) }))
// 监听窗口大小变化 // 监听窗口大小变化
if (this.resizeObserver) { if (this.resizeObserver) {
@ -359,17 +359,26 @@ export default class Viewport {
*/ */
updateGridVisibility() { updateGridVisibility() {
const cameraDistance = this.state.camera.position.y const cameraDistance = this.state.camera.position.y
const maxVisibleDistance = 60 // 网格完全可见的最大距离 const maxVisibleDistance = 4 // 网格完全不可见的最小距离
const fadeStartDistance = 15 // 开始淡出的距离 const fadeStartDistance = 9 // 开始淡出的最大距离
// 计算透明度（0~1） let opacity
let opacity = 0.8 if (cameraDistance >= fadeStartDistance) {
if (cameraDistance > fadeStartDistance) { // 如果摄像机位置在淡出开始距离或更远，则网格完全可见
opacity = 0.8 - Math.min((cameraDistance - fadeStartDistance) / (maxVisibleDistance - fadeStartDistance) * 0.8, 0.8) opacity = 1
} else if (cameraDistance <= maxVisibleDistance) {
// 如果摄像机位置小于等于最大可见距离，则网格完全不可见
opacity = 0
} else {
// 计算透明度，使用线性插值
opacity = 1 - (fadeStartDistance - cameraDistance) / (fadeStartDistance - maxVisibleDistance)
} }
// 修改网格材质透明度 // 设置材质的透明度，并确保材质的transparent属性为true以支持透明
this.gridHelper.material.opacity = opacity this.gridHelper.material.opacity = opacity
this.gridHelper.material.transparent = true
// 更新网格是否可见
this.gridHelper.visible = opacity > 0 this.gridHelper.visible = opacity > 0
} }

7
src/editor/menus/FileMenu.ts
View File

@ -2,6 +2,7 @@ import { renderIcon, setQueryParam } from '@/utils/webutils.ts'
import { defineMenu } from '@/runtime/DefineMenu.ts' import { defineMenu } from '@/runtime/DefineMenu.ts'
import SvgCode from '@/components/icons/SvgCode' import SvgCode from '@/components/icons/SvgCode'
import { nextTick } from 'vue' import { nextTick } from 'vue'
import type Viewport from '@/core/engine/Viewport.ts'
export default defineMenu((menus) => { export default defineMenu((menus) => {
menus.insertChildren('file', menus.insertChildren('file',
@ -34,8 +35,10 @@ export default defineMenu((menus) => {
}, },
{ {
name: 'save', label: '保存', icon: SvgCode.save, order: 2, tip: 'Ctrl+S', name: 'save', label: '保存', icon: SvgCode.save, order: 2, tip: 'Ctrl+S',
click: () => { click: async () => {
system.msg('保存模型文件') const viewport: Viewport = window['viewport']
const vdata: any = await viewport.stateManager.save()
console.log(system.json5.stringify(vdata.items))
} }
}, },
{ {

90
src/example/example1.js
View File

@ -15,16 +15,16 @@ export default {
gridHelper: { // 网格辅助线 gridHelper: { // 网格辅助线
axesEnabled: true, // 是否显示中心轴 axesEnabled: true, // 是否显示中心轴
axesSize: 5, axesSize: 5,
axesColor: 0xC7C7C7, axesColor: 0xDDDDDD,
axesWidth: 2, axesWidth: 2,
gridEnabled: true, // 是否显示网格 gridEnabled: true, // 是否显示网格
gridSize: 1000, // 网格大小 gridSize: 1000, // 网格大小
gridDivisions: 1000, // 网格分割数 gridDivisions: 1000, // 网格分割数
gridColor: 0xC7C7C7, // 网格颜色 gridColor: 0xDDDDDD, // 网格颜色
gridOpacity: 1, // 网格透明度 gridOpacity: 1, // 网格透明度
backgroundColor: 0x24292E, // 背景颜色 backgroundColor: 0xF5F5F5, // 背景颜色
snapEnabled: true, // 是否启用吸附 snapEnabled: true, // 是否启用吸附
snapDistance: 0.25 // 吸附距离 snapDistance: 0.25 // 吸附距离
} }
@ -80,86 +80,38 @@ export default {
id: 'P1', id: 'P1',
t: 'measure', t: 'measure',
v: true, v: true,
tf: [ tf: [[-4, 0.1, 4], [90, 0, 0], [0.25, 0.25, 0.1]],
[-4, 0.1, 4.75], dt: { in: [], out: [], center: ['P2'] }
[90, 0, 0],
[0.25, 0.25, 0.1]
],
dt: {
in: [],
out: [],
center: []
}
}, { }, {
id: 'P2', id: 'P2',
t: 'measure', t: 'measure',
v: true, v: true,
tf: [ tf: [[5, 0.1, 4], [90, 0, 0], [0.25, 0.25, 0.1]],
[5, 0.1, 2.75], dt: { in: [], out: [], center: ['P1', 'P3'] }
[90, 0, 0],
[0.25, 0.25, 0.1]
],
dt: {
in: [],
out: [],
center: ['P1']
}
}, { }, {
id: 'P3', id: 'P3',
t: 'measure', t: 'measure',
v: true, v: true,
tf: [ tf: [[5, 0.1, 6.25], [90, 0, 0], [0.25, 0.25, 0.1]],
[5, 0.1, 5.75], dt: { in: [], out: [], center: ['P2'] }
[90, 0, 0],
[0.25, 0.25, 0.1]
],
dt: {
in: [],
out: [],
center: ['P2']
}
}, { }, {
id: 'P4', id: '39zML1rnSOOQGQYQ2YUMGy',
t: 'measure', t: 'way',
v: true, v: true,
tf: [ tf: [[-4, 0.1, 2], [90, 0, 0], [0.25, 0.25, 0.1]],
[-1.25, 0.1, 7.25], dt: { in: [], out: [], center: ['6wrGKiVJniwgKkoggOoEy6'] }
[90, 0, 0],
[0.25, 0.25, 0.1]
],
dt: {
in: [],
out: [],
center: ['P3']
}
}, { }, {
id: 'P5', id: '39zML1rnSOOQGQYQ2YUMGy',
t: 'measure', t: 'way',
v: true, v: true,
tf: [ tf: [[-4, 0.1, 2], [90, 0, 0], [0.25, 0.25, 0.1]],
[-2, 0.1, 6], dt: { in: [], out: [], center: ['6wrGKiVJniwgKkoggOoEy6'] }
[90, 0, 0],
[0.25, 0.25, 0.1]
],
dt: {
in: [],
out: [],
center: ['P4']
}
}, { }, {
id: 'P6', id: '6wrGKiVJniwgKkoggOoEy6',
t: 'measure', t: 'way',
v: true, v: true,
tf: [ tf: [[5, 0.1, 2], [90, 0, 0], [0.25, 0.25, 0.1]],
[-3.5, 0.1, 5.25], dt: { in: [], out: [], center: ['39zML1rnSOOQGQYQ2YUMGy'] }
[90, 0, 0],
[0.25, 0.25, 0.1]
],
dt: {
in: [],
out: [],
center: ['P5']
}
} }
] ]
} }

4
src/modules/way/WayRenderer.ts
View File

@ -96,7 +96,7 @@ export default class WayRenderer extends BaseRenderer {
.addVectors(startPosition, endPosition) .addVectors(startPosition, endPosition)
.multiplyScalar(0.5) .multiplyScalar(0.5)
const distance = startPosition.distanceTo(endPosition) * 1000 const distance = (startPosition.distanceTo(endPosition) * 1000).toFixed(0)
const label = new Text() const label = new Text()
label.text = distance label.text = distance
@ -142,7 +142,7 @@ export default class WayRenderer extends BaseRenderer {
.addVectors(startPosition, endPosition) .addVectors(startPosition, endPosition)
.multiplyScalar(0.5) .multiplyScalar(0.5)
const distance = startPosition.distanceTo(endPosition) * 1000 const distance = (startPosition.distanceTo(endPosition) * 1000).toFixed(0)
label.text = distance label.text = distance
label.quaternion.copy(this.tempViewport.camera.quaternion) label.quaternion.copy(this.tempViewport.camera.quaternion)
label.sync() label.sync()

Write Preview
Loading…
Cancel
Save