forked from expo/troggle
remove unused copy of CaveView in troggle and updated cave.html
template for caveview2
This commit is contained in:
@@ -419,8 +419,7 @@ div#scene {
|
||||
|
||||
</style>
|
||||
|
||||
<script type="text/javascript" src="/javascript/CaveView/js/CaveView.js" ></script>
|
||||
<script type="text/javascript" src="/javascript/CaveView/lib/proj4.js" ></script>
|
||||
<script type="text/javascript" src="/javascript/CaveView/js/CaveView2.js" ></script>
|
||||
|
||||
|
||||
<script type="text/javascript" >
|
||||
@@ -428,7 +427,7 @@ div#scene {
|
||||
|
||||
// display the user interface - and a blank canvas
|
||||
// the configuration object specifies the location of CaveView, surveys and terrain files
|
||||
CV.UI.init( 'scene', {
|
||||
const viewer = new CV2.CaveViewer( 'scene', {
|
||||
home: '/javascript/CaveView/',
|
||||
surveyDirectory: '/expowebcache/3d/',
|
||||
terrainDirectory: '/loser/surface/terrain/' // cannot work, apache not handling this url
|
||||
@@ -436,10 +435,11 @@ div#scene {
|
||||
|
||||
// load a single survey to display
|
||||
// Note the special code in views.caves.py to do this. The appropriate .svx/.3d file may not be simply the cave name +.3d
|
||||
CV.UI.loadCave('{{svx3d}}.3d');
|
||||
//const ui = new CV2.CaveViewUI( viewer );
|
||||
|
||||
ui.loadCave('{{svx3d}}.3d');
|
||||
}
|
||||
// comment out loading CaveView until we have fixed everything
|
||||
// window.onload = onLoad;
|
||||
window.onload = onLoad;
|
||||
</script>
|
||||
{% endif %} <!-- all the above only loads if cave.survex_file is not empty-->
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user