kopia lustrzana https://github.com/OpenDroneMap/WebODM
Ability to measure with textured mesh overlayed
rodzic
b2e6434ec4
commit
1dc818b322
|
@ -6,7 +6,6 @@ import AssetDownloadButtons from './components/AssetDownloadButtons';
|
|||
import Standby from './components/Standby';
|
||||
import ShareButton from './components/ShareButton';
|
||||
import ImagePopup from './components/ImagePopup';
|
||||
import epsg from 'epsg';
|
||||
import PropTypes from 'prop-types';
|
||||
import * as THREE from 'THREE';
|
||||
import $ from 'jquery';
|
||||
|
@ -27,6 +26,9 @@ class TexturedModelMenu extends React.Component{
|
|||
this.state = {
|
||||
showTexturedModel: false
|
||||
}
|
||||
|
||||
// Translation for sidebar.html
|
||||
_("Cameras");
|
||||
}
|
||||
|
||||
handleClick = (e) => {
|
||||
|
@ -194,7 +196,7 @@ class ModelView extends React.Component {
|
|||
viewer.setEDLEnabled(true);
|
||||
viewer.setFOV(60);
|
||||
viewer.setPointBudget(1*1000*1000);
|
||||
viewer.setEDLEnabled(false); // Temporary fix: https://github.com/OpenDroneMap/WebODM/issues/873
|
||||
viewer.setEDLEnabled(true);
|
||||
viewer.loadSettingsFromURL();
|
||||
|
||||
viewer.loadGUI(() => {
|
||||
|
@ -377,9 +379,14 @@ class ModelView extends React.Component {
|
|||
}
|
||||
|
||||
setPointCloudsVisible = (flag) => {
|
||||
for(let pointcloud of viewer.scene.pointclouds){
|
||||
pointcloud.visible = flag;
|
||||
}
|
||||
viewer.setEDLEnabled(true);
|
||||
|
||||
// Using opacity we can still perform measurements
|
||||
viewer.setEDLOpacity(flag ? 1 : 0);
|
||||
|
||||
// for(let pointcloud of viewer.scene.pointclouds){
|
||||
// pointcloud.visible = flag;
|
||||
// }
|
||||
}
|
||||
|
||||
toggleCameras(e){
|
||||
|
@ -487,15 +494,6 @@ class ModelView extends React.Component {
|
|||
}
|
||||
|
||||
$(function(){
|
||||
// Add more proj definitions
|
||||
const defs = [];
|
||||
for (let k in epsg){
|
||||
if (epsg[k]){
|
||||
defs.push([k, epsg[k]]);
|
||||
}
|
||||
}
|
||||
window.proj4.defs(defs);
|
||||
|
||||
// Use gettext for translations
|
||||
const oldInit = i18n.init;
|
||||
i18n.addPostProcessor("gettext", function(v, k, opts){
|
||||
|
|
Plik diff jest za duży
Load Diff
|
@ -15,14 +15,14 @@
|
|||
<div>
|
||||
|
||||
<div id="potree_menu" class="accordion">
|
||||
<h3 id="cameras"><span>Cameras</span></h3>
|
||||
<h3 id="cameras"><span data-i18n="tb.cameras">Cameras</span></h3>
|
||||
<div id="cameras_container">
|
||||
<ul class="pv-menu-list">
|
||||
<li id="cameras_button"></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<h3 id="textured_model"><span>Textured Model</span></h3>
|
||||
<h3 id="textured_model"><span data-i18n="tb.textured_model">Textured Model</span></h3>
|
||||
<div id="textured_model_container">
|
||||
<ul class="pv-menu-list">
|
||||
<li id="textured_model_button"></li>
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
"d3": "^3.5.5",
|
||||
"enzyme": "^3.3.0",
|
||||
"enzyme-adapter-react-16": "^1.15.1",
|
||||
"epsg": "^0.5.0",
|
||||
"exifr": "^6.0.0",
|
||||
"extract-text-webpack-plugin": "^4.0.0-beta.0",
|
||||
"fbemitter": "^2.1.1",
|
||||
|
|
Ładowanie…
Reference in New Issue