Skip to content

Commit 9746122

Browse files
qiulinFVqiulinFV
committed
2 parents d450b37 + 623fac9 commit 9746122

File tree

12 files changed

+374
-368
lines changed

12 files changed

+374
-368
lines changed

‎.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12-
ignore:
13-
- dependency-name: "three"

‎build/webpack.config.classic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ module.exports = {
3131
moduleRules.push({
3232
test: /\.js/,
3333
loader: 'babel-loader',
34-
query: {
34+
options: {
3535
presets: ['@babel/preset-env']
3636
}
3737
});

‎dist/mapboxgl/include-mapboxgl.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
8484
}
8585
if (inArray(includes, 'three')) {
86-
inputScript('https://cdn.bootcss.com/three.js/92/three.min.js');
86+
inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/build/three.js');
8787
}
8888
if (inArray(includes, 'xlsx')) {
8989
inputScript('https://cdn.bootcss.com/xlsx/0.16.7/xlsx.core.min.js');
@@ -118,22 +118,17 @@
118118
if (inArray(includes, 'convert')) {
119119
inputScript('https://iclient.supermap.io/web/libs/xml-js/1.6.8/xml-js.min.js');
120120
}
121-
if (inArray(includes, 'LoaderSupport')) {
122-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderCommons.js');
123-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderBuilder.js');
124-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/LoaderWorkerSupport.js');
121+
if (inArray(includes, 'LegacyJSONLoader')) {
122+
inputScript('https://cdn.jsdelivr.net/npm/three@0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
125123
}
126124
if (inArray(includes, 'OBJLoader')) {
127-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/OBJLoader.js');
128-
}
129-
if (inArray(includes, 'OBJLoader2')) {
130-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/OBJLoader2.js');
125+
inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/OBJLoader.js');
131126
}
132127
if (inArray(includes, 'MTLLoader')) {
133-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/MTLLoader.js');
128+
inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/MTLLoader.js');
134129
}
135130
if (inArray(includes, 'GLTFLoader')) {
136-
inputScript('https://iclient.supermap.io/web/libs/three/plugins/loaders/GLTFLoader.js');
131+
inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/GLTFLoader.js');
137132
}
138133
if (inArray(includes, 'echarts-gl')) {
139134
inputScript('https://iclient.supermap.io/web/libs/echarts-gl/1.1.2/echarts-gl.min.js');

‎examples/mapboxgl/js/ThreeApplication.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ var SceneBuilder = {
7070

7171
function loadBuildingModel() {
7272

73-
var loader = new THREE.JSONLoader(manager);
74-
loader.setTexturePath('./js/obj/building/maps/');
73+
var loader = new THREE.LegacyJSONLoader(manager);
74+
// loader.setResourcePath()('./js/obj/building/maps/');
7575
loader.load('./js/obj/building/building.js', function (geometry, materials) {
7676
var material = new THREE.MultiMaterial(materials);
7777
for (var i = 0; i < materials.length; i++) {
@@ -90,7 +90,7 @@ var SceneBuilder = {
9090
}
9191
);
9292

93-
var loader = new THREE.JSONLoader(manager);
93+
var loader = new THREE.LegacyJSONLoader(manager);
9494
loader.load('./js/obj/building/building-roof.js', function (geometry, materials) {
9595
var material = new THREE.MultiMaterial(materials);
9696
for (var i = 0; i < materials.length; i++) {
@@ -118,7 +118,7 @@ var SceneBuilder = {
118118
function loadRoom(data) {
119119
var name = data.name,
120120
slug = data.slug,
121-
loader = new THREE.JSONLoader(manager);
121+
loader = new THREE.LegacyJSONLoader(manager);
122122

123123
loader.load("./js/" + data.objRoom, function (geometry, materials) {
124124
var material = new THREE.MeshPhongMaterial({

‎examples/mapboxgl/threejsLayer_airplane.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<body>
2828
<div id="map"></div>
2929
<script type="text/javascript" include="jquery" src="../js/include-web.js"></script>
30-
<script type="text/javascript" include="three,LoaderSupport,GLTFLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
30+
<script type="text/javascript" include="three,GLTFLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3131
<script>
3232

3333
var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +

‎examples/mapboxgl/threejsLayer_bird.html

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
<!--********************************************************************
2-
* Copyright© 2000 - 2020 SuperMap Software Co.Ltd. All rights reserved.
3-
*********************************************************************-->
1+
42
<!DOCTYPE html>
53
<html>
64
<head>
7-
<meta charset="UTF-8">
8-
<title data-i18n="resources.title_flyBird"></title>
9-
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
10-
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
11-
<style>
5+
<meta charset="UTF-8">
6+
<title data-i18n="resources.title_flyBird"></title>
7+
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
8+
<meta name="viewport" content="initial-scale=1.0, user-scalable=no, width=device-width">
9+
<style>
1210
html, body {
1311
margin: 0;
1412
padding: 0;
@@ -27,9 +25,8 @@
2725
<body>
2826
<div id="map"></div>
2927
<script type="text/javascript" include="jquery" src="../js/include-web.js"></script>
30-
<script type="text/javascript" include="three" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
28+
<script type="text/javascript" include="three,LegacyJSONLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3129
<script type="text/javascript" src="js/bird/ImprovedNoise.js"></script>
32-
3330
<script type="x-shader/x-vertex" id="vertexShader">
3431
varying vec3 vWorldPosition;
3532
void main() {
@@ -38,7 +35,6 @@
3835
gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
3936
}
4037
</script>
41-
4238
<script type="x-shader/x-fragment" id="fragmentShader">
4339
uniform vec3 topColor;
4440
uniform vec3 bottomColor;
@@ -122,7 +118,7 @@
122118
renderer.shadowMap.enabled = true;
123119

124120
//加载飞鸟模型
125-
var loader = new THREE.JSONLoader();
121+
var loader = new THREE.LegacyJSONLoader();
126122
loader.load('./js/bird/bird.js', function (geometry) {
127123
var material = new THREE.MeshPhongMaterial({
128124
color: 0xffffff,
@@ -132,7 +128,7 @@
132128
vertexColors: THREE.FaceColors,
133129
flatShading: true
134130
});
135-
var mesh = new THREE.Mesh(geometry, material);
131+
var mesh = new THREE.Mesh(new THREE.BufferGeometry().fromGeometry(geometry), material);
136132
mesh.position.y = 15;
137133
mesh.rotation.y = -1;
138134
mesh.castShadow = true;

‎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" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
29+
<script type="text/javascript" include="three,LegacyJSONLoader" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
3030
<script type="text/javascript" src="./js/ThreeApplication.js"></script>
3131
<script>
3232

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy