Skip to content

Commit fd50007

Browse files
xiongjiaojiaoxiongjiaojiao
committed
【update】three 升级0.129.0; review by zhangjq
1 parent 2e12dc6 commit fd50007

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

‎dist/mapboxgl/include-mapboxgl.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright© 2000 - 2022 SuperMap Software Co.Ltd. All rights reserved.
22
* This program are made available under the terms of the Apache License, Version 2.0
33
* which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
4-
(function () {
4+
(function () {
55
var r = new RegExp('(^|(.*?\\/))(include-mapboxgl.js)(\\?|$)'),
66
s = document.getElementsByTagName('script'),
77
targetScript;
@@ -96,6 +96,9 @@
9696
inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
9797
}
9898
if (inArray(includes, 'three')) {
99+
inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/build/three.min.js');
100+
}
101+
if (inArray(includes, 'three@0.121.1')) {
99102
inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/build/three.js');
100103
}
101104
if (inArray(includes, 'xlsx')) {
@@ -137,7 +140,7 @@
137140
);
138141
}
139142
if (inArray(includes, 'OBJLoader')) {
140-
inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/examples/js/loaders/OBJLoader.js');
143+
inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/examples/js/loaders/OBJLoader.js');
141144
}
142145

143146
if (inArray(includes, 'three92')) {
@@ -149,15 +152,14 @@
149152
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderWorkerSupport.js');
150153
}
151154
if (inArray(includes, 'OBJLoader2')) {
152-
inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/build/three.min.js');
153155
inputScript('https://iclient.supermap.io/web/libs/three-wtm/1.0.0/three-wtm.js');
154156
inputScript('https://iclient.supermap.io/web/libs/wwobjloader2/4.0.0/wwobjloader2.js');
155157
}
156158
if (inArray(includes, 'MTLLoader')) {
157-
inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/examples/js/loaders/MTLLoader.js');
159+
inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/examples/js/loaders/MTLLoader.js');
158160
}
159161
if (inArray(includes, 'GLTFLoader')) {
160-
inputScript('https://iclient.supermap.io/web/libs/three/0.121.1/examples/js/loaders/GLTFLoader.js');
162+
inputScript('https://iclient.supermap.io/web/libs/three/0.129.0/examples/js/loaders/GLTFLoader.js');
161163
}
162164
if (inArray(includes, 'echarts-gl')) {
163165
inputScript('https://iclient.supermap.io/web/libs/echarts-gl/1.1.2-fix/echarts-gl.min.js');

‎examples/component/components_timeline_tracklayer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title data-i18n="resources.title_componentsTimeLineTracklayer_Vue"></title>
99
<script type="text/javascript" include="vue,jquery,papaparse" src="../js/include-web.js"></script>
1010
<script
11-
include="lodash,moment,OBJLoader2,echarts-vue,iclient-mapboxgl-vue,mapbox-gl-enhance"
11+
include="lodash,moment,three,OBJLoader2,echarts-vue,iclient-mapboxgl-vue,mapbox-gl-enhance"
1212
src="../../dist/mapboxgl/include-mapboxgl.js"
1313
></script>
1414
<style>

‎examples/mapboxgl/threejsLayer_bird.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<body>
2626
<div id="map"></div>
2727
<script type="text/javascript" include="jquery" src="../js/include-web.js"></script>
28-
<script type="text/javascript" include="three,LegacyJSONLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
28+
<script type="text/javascript" include="three@0.121.1,LegacyJSONLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
2929
<script type="text/javascript" src="js/bird/ImprovedNoise.js"></script>
3030
<script type="x-shader/x-vertex" id="vertexShader">
3131
varying vec3 vWorldPosition;
@@ -163,4 +163,4 @@
163163

164164
</script>
165165
</body>
166-
</html>
166+
</html>

‎examples/mapboxgl/threejsLayer_buildings.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<body>
2727
<div id="map"></div>
2828
<script type="text/javascript" include="jquery" src="../js/include-web.js"></script>
29-
<script type="text/javascript" include="three,LegacyJSONLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
29+
<script type="text/javascript" include="three@0.121.1,LegacyJSONLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3030
<script type="text/javascript" src="./js/ThreeApplication.js"></script>
3131
<script>
3232

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"pbf": "3.2.1",
133133
"proj4": "2.7.5",
134134
"promise-polyfill": "8.2.1",
135-
"three": "0.126.1",
135+
"three": "0.129.0",
136136
"xlsx": "0.18.0",
137137
"xml-js": "1.6.11"
138138
},

‎src/mapboxgl/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"echarts": "4.9.0",
1919
"mapv": "2.0.62",
2020
"mapbox-gl": "1.13.2",
21-
"three": "0.126.1",
21+
"three": "0.129.0",
2222
"xlsx": "0.18.0",
2323
"@supermap/iclient-common": "11.0.0",
2424
"canvg": "3.0.7",

0 commit comments

Comments
 (0)