Skip to content

Commit

Permalink
refactor(#5): ♻️ fix some confilcts with dev
Browse files Browse the repository at this point in the history
  • Loading branch information
gautegf committed Oct 6, 2025
1 parent 985abe1 commit 5fb1a1f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 52 deletions.
51 changes: 0 additions & 51 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,57 +79,6 @@
<div id="potree_sidebar_container"></div>
</div>

<script src="src/ElevationControl/elevationControl.js"></script>
<script src="/src/MeasurementControl/measurementsPanel.js"></script>

<script type="module">
window.viewer = new Potree.Viewer(
document.getElementById('potree_render_area')
)

viewer.setEDLEnabled(true)
viewer.setFOV(60)
viewer.setPointBudget(5_000_000)
viewer.loadSettingsFromURL()

viewer.setDescription('Molloy Explorer')

viewer.loadGUI(() => {
viewer.setLanguage('en')
$('#menu_appearance').next().show()
$('#menu_tools').next().show()
$('#menu_scene').next().show()
$('#menu_filters').next().show()
viewer.toggleSidebar()

if (window.initElevationControls) {
window.initElevationControls(viewer)
} else {
console.warn('initElevationControls not found on window')
}

if (window.initMeasurementsPanel) {
window.initMeasurementsPanel(viewer)
} else {
console.warn('initMeasurementsPanel not found on window')
}
})

let url = './pointclouds/data_converted/metadata.json'

Potree.loadPointCloud(url).then((e) => {
let pointcloud = e.pointcloud
let material = pointcloud.material

material.pointSizeType = Potree.PointSizeType.ADAPTIVE
material.shape = Potree.PointShape.CIRCLE
material.activeAttributeName = 'elevation'
material.gradient = Potree.Gradients['VIRIDIS']

viewer.scene.addPointCloud(pointcloud)
viewer.fitToScreen()
})
</script>
<script type="module" src="src/main.js"></script>
</body>
</html>
6 changes: 5 additions & 1 deletion src/MeasurementControl/measurementsPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* entries with per-type numbering, syncs selection with Potree's jsTree, and
* dynamically mounts the native properties panel when a measurement is active.
*/
window.initMeasurementsPanel = function initMeasurementsPanel(viewer) {
window.createMeasurementsPanel = function createMeasurementsPanel(viewer) {
// Track last selected measurement label for dynamic data title
const lastSelection = { uuid: null, label: '' }
// Resolve or create measurements container in Potree menu
Expand Down Expand Up @@ -676,3 +676,7 @@ window.initMeasurementsPanel = function initMeasurementsPanel(viewer) {
}
}
}

export function initMeasurementsPanel(viewer) {
return window.createMeasurementsPanel(viewer)
}
2 changes: 2 additions & 0 deletions src/potreeViewer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { initElevationControls } from './ElevationControl/elevationControl.js'
import { initMeasurementsPanel } from './MeasurementControl/measurementsPanel.js'
import { ecef } from './config.js'

/**
Expand Down Expand Up @@ -35,6 +36,7 @@ export async function createPotreeViewer(containerId, pointcloudUrl, settings) {
viewer.toggleSidebar()

initElevationControls(viewer)
initMeasurementsPanel(viewer)
})

const e = await Potree.loadPointCloud(pointcloudUrl)
Expand Down

0 comments on commit 5fb1a1f

Please sign in to comment.