Skip to content

X
x3domlet
Commit 3cafecd0 authored by Rurik Bugdanov's avatar Rurik Bugdanov
Browse files
Options

update html files 

- add tags for usemin and wiredep
- load css before js
- add js/x3dom/x3dom-full.debug.js to test.html
parent 425f4da4
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 21 deletions
index.html
View file @ 3cafecd0
...@@ -4,12 +4,20 @@ ...@@ -4,12 +4,20 @@
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>x3d models index</title> <title>x3d models index</title>
<script type='text/javascript' src='js/jquery/jquery-3.1.1.js'></script> <!-- build:css css/index.css -->
<script type='text/javascript' src='js/leaflet/leaflet-src.js'></script> <!-- bower:css -->
<script type='text/javascript' src='js/index.js'></script> <!-- endbower -->
<link rel='stylesheet' type='text/css' href='js/leaflet/leaflet.css'></link> <link rel='stylesheet' type='text/css' href='js/leaflet/leaflet.css'></link>
<link rel='stylesheet' type='text/css' href='js/index.css'></link> <link rel='stylesheet' type='text/css' href='js/index.css'></link>
<!-- endbuild -->
<!-- build:js js/index.js -->
<!-- bower:js -->
<script src='bower_components/jquery/dist/jquery.js'></script>
<!-- endbower -->
<script type='text/javascript' src='js/leaflet/leaflet-src.js'></script>
<script type='text/javascript' src='js/index.js'></script>
<!-- endbuild -->
</head> </head>
<body> <body>
......
map.html
View file @ 3cafecd0
...@@ -3,16 +3,25 @@ ...@@ -3,16 +3,25 @@
<head> <head>
<title>Ze Map</title> <title>Ze Map</title>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<script type='text/javascript' src='js/jquery/jquery-3.1.1.js'></script> <!-- build:css css/map.css -->
<!-- bower:css -->
<!-- endbower -->
<link rel='stylesheet' type='text/css' href='js/leaflet/leaflet.css'></link>
<link rel='stylesheet' type='text/css' href='js/map.css'></link>
<!--endbuild-->
<!-- build:js js/map.js -->
<!-- bower:js -->
<script src='bower_components/jquery/dist/jquery.js'></script>
<!-- endbower -->
<script type='text/javascript' src='js/leaflet/leaflet-src.js'></script> <script type='text/javascript' src='js/leaflet/leaflet-src.js'></script>
<script type='text/javascript' src='js/leaflet/leaflet.camera-view-marker-controls.js'></script> <script type='text/javascript' src='js/leaflet/leaflet.camera-view-marker-controls.js'></script>
<script type='text/javascript' src='js/leaflet/leaflet.camera-view-marker.js'></script> <script type='text/javascript' src='js/leaflet/leaflet.camera-view-marker.js'></script>
<script type='text/javascript' src='js/leaflet/leaflet.camera-view-marker.measure.js'></script> <script type='text/javascript' src='js/leaflet/leaflet.camera-view-marker.measure.js'></script>
<script type='text/javascript' src='js/map.js'></script> <script type='text/javascript' src='js/map.js'></script>
<link rel='stylesheet' type='text/css' href='js/leaflet/leaflet.css'></link> <!--endbuild-->
<link rel='stylesheet' type='text/css' href='js/map.css'></link>
</head> </head>
<body> <body>
<div id="leaflet_map"></div> <div id="leaflet_map"></div>
</body> </body>
</html> </html>
ls
test.html
View file @ 3cafecd0
...@@ -4,7 +4,19 @@ ...@@ -4,7 +4,19 @@
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>Scene+Map</title> <title>Scene+Map</title>
<script type='text/javascript' src='js/jquery/jquery-3.1.1.js'></script> <!-- build:css css/test.css -->
<!-- bower:css -->
<!-- endbower -->
<link rel='stylesheet' type='text/css' href='js/leaflet/leaflet.css'></link>
<link rel='stylesheet' type='text/css' href='js/x3dom/x3dom.css'></link>
<link rel='stylesheet' type='text/css' href='js/ui.css'></link>
<!-- endbuild -->
<!-- build:js js/test.js -->
<!-- bower:js -->
<script src='bower_components/jquery/dist/jquery.js'></script>
<!-- endbower -->
<script type='text/javascript' src='js/leaflet/leaflet-src.js'></script> <script type='text/javascript' src='js/leaflet/leaflet-src.js'></script>
<script type='text/javascript' src='js/leaflet/L.extra.js'></script> <script type='text/javascript' src='js/leaflet/L.extra.js'></script>
...@@ -14,6 +26,7 @@ ...@@ -14,6 +26,7 @@
<script type='text/javascript' src='js/x3dom_init.js'></script> <script type='text/javascript' src='js/x3dom_init.js'></script>
<script type='text/javascript' src='js/x3dom_functions.js'></script> <script type='text/javascript' src='js/x3dom_functions.js'></script>
<script type='text/javascript' src='js/x3dom/x3dom-full.debug.js'></script>
<script type='text/javascript' src='js/leaflet_init.js'></script> <script type='text/javascript' src='js/leaflet_init.js'></script>
<script type='text/javascript' src='js/x3l.js'></script> <script type='text/javascript' src='js/x3l.js'></script>
...@@ -25,16 +38,12 @@ ...@@ -25,16 +38,12 @@
<script type='text/javascript' src='js/ui_align.js'></script> <script type='text/javascript' src='js/ui_align.js'></script>
<script type='text/javascript' src='js/util_functions.js'></script> <script type='text/javascript' src='js/util_functions.js'></script>
<!-- endbuild -->
<link rel='stylesheet' type='text/css' href='js/leaflet/leaflet.css'></link>
<link rel='stylesheet' type='text/css' href='js/x3dom/x3dom.css'></link>
<link rel='stylesheet' type='text/css' href='js/ui.css'></link>
</head> </head>
<body> <body>
<div id='x3d_wrapper'> <div id='x3d_wrapper'>
<x3d id="x3d_id" width='1600px' height='800px' showProgress="true" showStat="false" showLog="false"> <x3d id="x3d_id" width="100%" height="100%" showProgress="true" showStat="false" showLog="false">
<scene> <scene>
<navigationInfo id="navInfo" type='"examine"' speed='0.01'></navigationInfo> <navigationInfo id="navInfo" type='"examine"' speed='0.01'></navigationInfo>
<Viewpoint fieldOfView='1' position='0 0 0' orientation='0 0 1 0'></Viewpoint> <Viewpoint fieldOfView='1' position='0 0 0' orientation='0 0 1 0'></Viewpoint>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment