Skip to content

Commit

Permalink
refactor: 🔀 Resolve mergeconflict with dev locally
Browse files Browse the repository at this point in the history
  • Loading branch information
mariewah committed Oct 24, 2025
2 parents 8b54df5 + e537d11 commit c7c56a4
Show file tree
Hide file tree
Showing 11 changed files with 2,374 additions and 888 deletions.
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ npm install
npm run dev
```

Then in a new terminal run the server:

```bash
npm run server
```

Open your browser at <http://localhost:5173> to view the app.

### Build for Production
Expand All @@ -31,3 +37,13 @@ npm run build
```

The built files will be in the `dist/` folder.

## Structure

### The Potree Build

This application is built using Potree as a package, meaning that the potree build is used as a base layer for UI and functionality and built onto by our own code. The add-ons may use, move or manipulate objects from the potree build, referencing the objects by classname or id.

### Updating Potree version

To update the version of Potree that this application uses you must make a build from the official potree app and replace the build folder here with the new one. There is no guarantee that Molloy Explorer is compatible with other versions of potree. Make sure that everything works on the development server before applying this to the production server.
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
rel="stylesheet"
href="/src/MeasurementControl/measurementsPanel.css"
/>
<link rel="stylesheet" href="/src/AnnotationControl/annotationPanel.css" />
<link rel="stylesheet" href="src/AcceptedFiltering/threePanels.css" />
</head>

Expand Down
Loading

0 comments on commit c7c56a4

Please sign in to comment.