mirror
/
OpenDroneMap-WebODM
kopia lustrzana https://github.com/OpenDroneMap/WebODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix THREE.js import

pull/875/head
Piero Toffanin 2020-06-04 14:06:09 -04:00
rodzic 06c4dbd7c0
commit 2a05802f70
3 zmienionych plików z 46 dodań i 40 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

42
app/templates/app/3d_model_display.html
Wyświetl plik

@ -1,32 +1,34 @@
{% extends "app/logged_in_base.html" %}
{% load i18n %}
{% block headers-before-bundle %}
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/build/potree/potree.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/openlayers3/ol.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/spectrum/spectrum.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jstree/themes/mixed/style.css">
<script src="/static/app/js/vendor/potree/libs/spectrum/spectrum.js"></script>
<script src="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/build/three.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/extra/lines.js"></script>
<script src="/static/app/js/vendor/potree/libs/other/BinaryHeap.js"></script>
<script src="/static/app/js/vendor/potree/libs/tween/tween.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/d3/d3.js"></script>
<script src="/static/app/js/vendor/potree/libs/proj4/proj4.js"></script>
<script src="/static/app/js/vendor/potree/libs/openlayers3/ol.js"></script>
<script src="/static/app/js/vendor/potree/libs/i18next/i18next.js"></script>
<script src="/static/app/js/vendor/potree/libs/jstree/jstree.js"></script>
<script src="/static/app/js/vendor/potree/build/potree/potree.js"></script>
<script src="/static/app/js/vendor/potree/libs/plasio/js/laslaz.js"></script>
{% endblock %}
{% block content %}
{% load render_bundle from webpack_loader %}
{% render_bundle 'ModelView' attrs='async' %}
<h3><i class="fa fa-cube"></i> {{title}}</h3>
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/build/potree/potree.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/openlayers3/ol.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/spectrum/spectrum.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jstree/themes/mixed/style.css">
<script src="/static/app/js/vendor/potree/libs/spectrum/spectrum.js"></script>
<script src="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/build/three.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/extra/lines.js"></script>
<script src="/static/app/js/vendor/potree/libs/other/BinaryHeap.js"></script>
<script src="/static/app/js/vendor/potree/libs/tween/tween.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/d3/d3.js"></script>
<script src="/static/app/js/vendor/potree/libs/proj4/proj4.js"></script>
<script src="/static/app/js/vendor/potree/libs/openlayers3/ol.js"></script>
<script src="/static/app/js/vendor/potree/libs/i18next/i18next.js"></script>
<script src="/static/app/js/vendor/potree/libs/jstree/jstree.js"></script>
<script src="/static/app/js/vendor/potree/build/potree/potree.js"></script>
<script src="/static/app/js/vendor/potree/libs/plasio/js/laslaz.js"></script>
<div data-modelview class="full-height"
{% for key, value in params %}
data-{{key}}="{{value}}"

2
app/templates/app/base.html
Wyświetl plik

@ -21,6 +21,8 @@
<script src="{% static 'app/js/vendor/jquery-1.11.2.min.js' %}"></script>
<script src="{% static 'app/js/vendor/system.js' %}"></script>
{% block headers-before-bundle %}{% endblock %}
{% load render_bundle from webpack_loader %}
{% render_bundle 'main' %}

42
app/templates/app/public/3d_model_display.html
Wyświetl plik

@ -1,30 +1,32 @@
{% extends "app/public/base.html" %}
{% block headers-before-bundle %}
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/build/potree/potree.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/openlayers3/ol.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/spectrum/spectrum.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jstree/themes/mixed/style.css">
<script src="/static/app/js/vendor/potree/libs/spectrum/spectrum.js"></script>
<script src="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/build/three.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/extra/lines.js"></script>
<script src="/static/app/js/vendor/potree/libs/other/BinaryHeap.js"></script>
<script src="/static/app/js/vendor/potree/libs/tween/tween.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/d3/d3.js"></script>
<script src="/static/app/js/vendor/potree/libs/proj4/proj4.js"></script>
<script src="/static/app/js/vendor/potree/libs/openlayers3/ol.js"></script>
<script src="/static/app/js/vendor/potree/libs/i18next/i18next.js"></script>
<script src="/static/app/js/vendor/potree/libs/jstree/jstree.js"></script>
<script src="/static/app/js/vendor/potree/build/potree/potree.js"></script>
<script src="/static/app/js/vendor/potree/libs/plasio/js/laslaz.js"></script>
{% endblock %}
{% block content %}
{% load render_bundle from webpack_loader %}
{% render_bundle 'ModelView' attrs='async' %}
<h3><i class="fa fa-cube"></i> {{title}}</h3>
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/build/potree/potree.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/openlayers3/ol.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/spectrum/spectrum.css">
<link rel="stylesheet" type="text/css" href="/static/app/js/vendor/potree/libs/jstree/themes/mixed/style.css">
<script src="/static/app/js/vendor/potree/libs/spectrum/spectrum.js"></script>
<script src="/static/app/js/vendor/potree/libs/jquery-ui/jquery-ui.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/build/three.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/three.js/extra/lines.js"></script>
<script src="/static/app/js/vendor/potree/libs/other/BinaryHeap.js"></script>
<script src="/static/app/js/vendor/potree/libs/tween/tween.min.js"></script>
<script src="/static/app/js/vendor/potree/libs/d3/d3.js"></script>
<script src="/static/app/js/vendor/potree/libs/proj4/proj4.js"></script>
<script src="/static/app/js/vendor/potree/libs/openlayers3/ol.js"></script>
<script src="/static/app/js/vendor/potree/libs/i18next/i18next.js"></script>
<script src="/static/app/js/vendor/potree/libs/jstree/jstree.js"></script>
<script src="/static/app/js/vendor/potree/build/potree/potree.js"></script>
<script src="/static/app/js/vendor/potree/libs/plasio/js/laslaz.js"></script>
<div data-modelview class="full-height"
{% for key, value in params %}