Skip to content

Commit

Permalink
use sphere for beacon
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmyangXYZ
AmyangXYZ committed Dec 23, 2023
1 parent f4f2e24 commit 9a3746c
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 82 deletions.
134 changes: 54 additions & 80 deletions src/hooks/useDrawTopology.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export function useDrawTopology(dom: HTMLElement) {
scene.remove(drawnNodes[i].model)
scene.remove(drawnNodes[i].label)
scene.remove(drawnNodes[i].dragBox)
scene.remove(drawnNodes[i].boxHelper)
scene.remove(drawnNodes[i].dragBoxHelper)
}
drawnNodes = {}
}
Expand Down Expand Up @@ -175,28 +175,14 @@ export function useDrawTopology(dom: HTMLElement) {
label.position.set(model.position.x, 3.5, model.position.z) // Adjust the position as needed
scene.add(label)

const dragBox = new THREE.Mesh(
new THREE.BoxGeometry(size.x, size.y, size.z),
new THREE.MeshBasicMaterial({ transparent: true, opacity: 0 })
)
dragBox.geometry.translate(0, size.y / 2, 0)
dragBox.position.copy(model.position)
dragBox.userData.type = NODE_TYPE[node.type]
dragBox.userData.node_id = node.id
dragBox.castShadow = false
scene.add(dragBox)
objectsToDrag.push(dragBox)

const boxHelper = new THREE.BoxHelper(dragBox, 'skyblue')
boxHelper.visible = false
boxHelper.castShadow = false
scene.add(boxHelper)
const { dragBox, dragBoxHelper } = createDragBox(node, model)

drawnNodes[`${NODE_TYPE[node.type]}-${node.id}`] = {
model,
label,
modelGroup,
dragBox,
boxHelper
dragBoxHelper
}
}
})
Expand Down Expand Up @@ -242,28 +228,14 @@ export function useDrawTopology(dom: HTMLElement) {
label.position.set(model.position.x, 3.5, model.position.z) // Adjust the position as needed
scene.add(label)

const dragBox = new THREE.Mesh(
new THREE.BoxGeometry(size.x, size.y, size.z),
new THREE.MeshBasicMaterial({ transparent: true, opacity: 0 })
)
dragBox.geometry.translate(0, size.y / 2, 0)
dragBox.position.copy(model.position)
dragBox.userData.type = NODE_TYPE[node.type]
dragBox.userData.node_id = node.id
dragBox.castShadow = false
scene.add(dragBox)
objectsToDrag.push(dragBox)

const boxHelper = new THREE.BoxHelper(dragBox, 'skyblue')
boxHelper.visible = false
boxHelper.castShadow = false
scene.add(boxHelper)
const { dragBox, dragBoxHelper } = createDragBox(node, model)

drawnNodes[`${NODE_TYPE[node.type]}-${node.id}`] = {
model,
label,
modelGroup,
dragBox,
boxHelper
dragBoxHelper
}
}
})
Expand Down Expand Up @@ -304,27 +276,14 @@ export function useDrawTopology(dom: HTMLElement) {
label.position.set(model.position.x, size.y + 1, model.position.z) // Adjust the position as needed
scene.add(label)

const dragBox = new THREE.Mesh(
new THREE.BoxGeometry(size.x, size.y, size.z),
new THREE.MeshBasicMaterial({ transparent: true, opacity: 0 })
)
dragBox.geometry.translate(0, size.y / 2, 0)
dragBox.position.copy(modelGroup.position)
dragBox.userData.type = NODE_TYPE[node.type]
dragBox.userData.node_id = node.id
scene.add(dragBox)
objectsToDrag.push(dragBox)

const boxHelper = new THREE.BoxHelper(dragBox, 'skyblue')
boxHelper.visible = false
boxHelper.castShadow = false
scene.add(boxHelper)
const { dragBox, dragBoxHelper } = createDragBox(node, model)

drawnNodes[`${NODE_TYPE[node.type]}-${node.id}`] = {
model,
label,
modelGroup,
dragBox,
boxHelper
dragBoxHelper
}
})
}
Expand All @@ -345,10 +304,6 @@ export function useDrawTopology(dom: HTMLElement) {
}
})

const box = new THREE.Box3().setFromObject(modelTemplate)
const size = new THREE.Vector3()
box.getSize(size)

for (const node of Network.Nodes.value) {
if (node.id == 0 || node.type != NODE_TYPE.FiveGUE) continue
let modelGroup: any = {}
Expand All @@ -370,33 +325,41 @@ export function useDrawTopology(dom: HTMLElement) {
label.position.set(model.position.x, 3.5, model.position.z) // Adjust the position as needed
scene.add(label)

const dragBox = new THREE.Mesh(
new THREE.BoxGeometry(size.x, size.y, size.z),
new THREE.MeshBasicMaterial({ transparent: true, opacity: 0 })
)
dragBox.geometry.translate(0, size.y / 2, 0)
dragBox.position.copy(model.position)
dragBox.userData.type = NODE_TYPE[node.type]
dragBox.userData.node_id = node.id
dragBox.castShadow = false
scene.add(dragBox)
objectsToDrag.push(dragBox)

const boxHelper = new THREE.BoxHelper(dragBox, 'skyblue')
boxHelper.visible = false
boxHelper.castShadow = false
scene.add(boxHelper)
const { dragBox, dragBoxHelper } = createDragBox(node, model)

drawnNodes[`${NODE_TYPE[node.type]}-${node.id}`] = {
model,
label,
modelGroup,
dragBox,
boxHelper
dragBoxHelper
}
}
})
}

const createDragBox = (node: any, model: any): any => {
const box = new THREE.Box3().setFromObject(model)
const size = new THREE.Vector3()
box.getSize(size)
const dragBox = new THREE.Mesh(
new THREE.BoxGeometry(size.x, size.y, size.z),
new THREE.MeshBasicMaterial({ transparent: true, opacity: 0 })
)
dragBox.geometry.translate(0, size.y / 2, 0)
dragBox.position.copy(model.position)
dragBox.userData.type = NODE_TYPE[node.type]
dragBox.userData.node_id = node.id
dragBox.castShadow = false
dragBox.visible = false
scene.add(dragBox)
objectsToDrag.push(dragBox)

const dragBoxHelper = new THREE.BoxHelper(dragBox, 'skyblue')
dragBoxHelper.visible = false
dragBoxHelper.castShadow = false
scene.add(dragBoxHelper)
return { dragBox, dragBoxHelper }
}
const drawEndSystems = () => {}

let drawnLinks: { [uid: number]: any } = {}
Expand Down Expand Up @@ -500,16 +463,28 @@ export function useDrawTopology(dom: HTMLElement) {
const positions: any = []
drawnUnicastPackets.push({ mesh, curve, positions, src: pkt.src, dst: pkt.dst })
} else if (pkt.type == PKT_TYPES.BEACON) {
const geometry = new THREE.TorusGeometry(Network.TopoConfig.value.tx_range, 0.08, 16, 64)
// const geometry = new THREE.TorusGeometry(Network.TopoConfig.value.tx_range, 0.08, 16, 64)
const geometry = new THREE.SphereGeometry(
Network.TopoConfig.value.tx_range,
32,
32,
0,
Math.PI,
0,
-Math.PI
)
const material = new THREE.MeshBasicMaterial({
color: 'white',
color: 'skyblue',
opacity: 0.33,
transparent: true,
// map: texture, To-do: add texture
side: THREE.DoubleSide
})
const mesh = new THREE.Mesh(geometry, material)
mesh.rotation.x = Math.PI / 2
mesh.position.set(
Network.Nodes.value[pkt.src].pos[0],
1.6,
.5,
Network.Nodes.value[pkt.src].pos[1]
)
scene.add(mesh)
Expand Down Expand Up @@ -598,14 +573,13 @@ export function useDrawTopology(dom: HTMLElement) {
const scale = -(Math.cos(Math.PI * time) - 1) / 2
for (const b of drawnBeaconPackets) {
b.mesh.scale.set(scale, scale, scale)
b.mesh.position.y = 5 * time + 1.6
}

if (SignalEditTopology.value) {
for (const i in drawnNodes) {
const node = drawnNodes[i]
node.modelGroup.position.copy(node.dragBox.position)
node.boxHelper.update()
node.dragBoxHelper.update()
if (node.label != undefined) {
node.label.position.set(
node.dragBox.position.x,
Expand All @@ -623,12 +597,12 @@ export function useDrawTopology(dom: HTMLElement) {
stats.update()
}

// main
setCamera()
addLights()
drawGround()
drawNodes()
drawLinks()
// draw5GTower()
animate()

watch(Network.SlotDone, () => {
Expand Down Expand Up @@ -657,7 +631,7 @@ export function useDrawTopology(dom: HTMLElement) {
}
for (const i in drawnNodes) {
const node = drawnNodes[i]
node.boxHelper.visible = !node.boxHelper.visible
node.dragBoxHelper.visible = !node.dragBoxHelper.visible
}
})

Expand Down
1 change: 0 additions & 1 deletion src/networks/TSCH/network.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export class TSCHNetwork extends Network {
constructor() {
super()
this.Type = NetworkType.TSCH
this.SlotDuration.value = 500
this.Schedule = ref<Cell[][]>([])
this.SchConfig = ref<ScheduleConfig>({
num_slots: 40,
Expand Down
2 changes: 1 addition & 1 deletion src/networks/common.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export class Network {
SignalReset = ref(0)
SlotDone = ref(true)
Running = ref(false)
SlotDuration = ref(1000)
SlotDuration = ref(750)

constructor() {
this.ID = 1
Expand Down

0 comments on commit 9a3746c

Please sign in to comment.