Merge pull request #874 from pierotofy/camerajson

Fix: #873
pull/876/head
Piero Toffanin 2020-06-04 12:36:55 -04:00 zatwierdzone przez GitHub
commit 97a7a8af90
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 4 dodań i 1 usunięć

Wyświetl plik

@ -8,6 +8,7 @@ import ShareButton from './components/ShareButton';
import ImagePopup from './components/ImagePopup'; import ImagePopup from './components/ImagePopup';
import epsg from 'epsg'; import epsg from 'epsg';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import * as THREE from 'THREE';
import $ from 'jquery'; import $ from 'jquery';
require('./vendor/OBJLoader'); require('./vendor/OBJLoader');
@ -192,6 +193,7 @@ class ModelView extends React.Component {
viewer.setEDLEnabled(true); viewer.setEDLEnabled(true);
viewer.setFOV(60); viewer.setFOV(60);
viewer.setPointBudget(1*1000*1000); viewer.setPointBudget(1*1000*1000);
viewer.setEDLEnabled(false); // Temporary fix: https://github.com/OpenDroneMap/WebODM/issues/873
viewer.loadSettingsFromURL(); viewer.loadSettingsFromURL();
viewer.loadGUI(() => { viewer.loadGUI(() => {

Wyświetl plik

@ -1,6 +1,6 @@
{ {
"name": "WebODM", "name": "WebODM",
"version": "1.4.0", "version": "1.4.1",
"description": "User-friendly, extendable application and API for processing aerial imagery.", "description": "User-friendly, extendable application and API for processing aerial imagery.",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {

Wyświetl plik

@ -86,6 +86,7 @@ module.exports = {
// on the global let jQuery // on the global let jQuery
"jquery": "jQuery", "jquery": "jQuery",
"SystemJS": "SystemJS", "SystemJS": "SystemJS",
"THREE": "THREE",
"React": "React", "React": "React",
"ReactDOM": "ReactDOM" "ReactDOM": "ReactDOM"
}, },