This commit is contained in:
Zemledelec 2025-04-15 18:08:27 +04:00
parent 43c2163974
commit a85bb311d4
126 changed files with 2 additions and 2065512 deletions

3
.gitignore vendored
View File

@ -7,4 +7,5 @@ docs
coverage coverage
lib lib
.vscode .vscode
**/.DS_Store **/.DS_Store
examples

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,110 +0,0 @@
<html>
<head>
<title>OpenStreetMap Base Layer</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../../css/og.css" type="text/css"/>
<style>
body {
padding: 0;
margin: 0;
}
</style>
</head>
<body>
<div id="earth" style="position: absolute; width:100%;height:100%"></div>
<div style="font-size: 1.3em; background: white; position: absolute; right:100px; top:20px;display: flex;flex-direction: column">
</div>
<script type="module" id="og-sandbox-script">
import {
Globe,
control,
OpenStreetMap,
Bing,
GlobusRgbTerrain,
Object3d,
Vector,
Entity
} from "../../lib/@openglobus/og.esm.js";
async function main() {
let cubesLayer = new Vector("objects", {
scaleByDistance: [1, 1, 1]
});
const cube = Object3d.createCube(10000, 10000, 10000);
for (let i = -90; i < 90; i += 10) {
for (let j = -180; j < 180; j += 10) {
cubesLayer.add(new Entity({
lonlat: [i, j, 10000],
geoObject: {
color: "white",
scale: 3.0,
instanced: true,
tag: 'cube',
object3d: cube,
yaw: 0,
pitch: 0
}
})
);
}
}
let spheresLayer = new Vector("spheres", {
scaleByDistance: [1, 1, 1],
depthOrder: 0
});
const sphere = Object3d.createSphere(16, 16, 5000);
for (let i = -90; i < 90; i += 10) {
for (let j = -180; j < 180; j += 10) {
spheresLayer.add(new Entity({
lonlat: [i + 0.1, j, 12000],
geoObject: {
color: "red",
scale: 3.0,
instanced: true,
tag: 'sphere',
object3d: sphere,
yaw: 0,
pitch: 0
}
})
);
}
}
const globus = new Globe({
target: "earth",
name: "Earth",
terrain: new GlobusRgbTerrain(),
layers: [new OpenStreetMap(), new Bing(), cubesLayer, spheresLayer],
atmosphereEnabled: false,
fontsSrc: "../../res/fonts",
sun: {
stopped: false
}
});
globus.planet.addControl(new control.DebugInfo({}));
globus.planet.addControl(new control.KeyboardNavigation());
globus.planet.addControl(new control.ToggleWireframe());
globus.planet.addControl(new control.LayerSwitcher());
globus.planet.addControl(new control.Lighting());
globus.planet.addControl(new control.GeoObjectEditor());
}
main()
</script>
</body>
</html>

File diff suppressed because it is too large Load Diff

View File

@ -1,616 +0,0 @@
newmtl default_tubes
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/sc1_01_01_01.jpg
newmtl default
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/aw2.jpg
newmtl default_glass
d 0.8
Ns 1
Ni 0
Ka 0 0 0
Kd 0 0 0
Ks 1 1 1
Km 0
newmtl default_lamp_poles
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_lights
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_Area
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 0.156863 0.14902 0.176471
Ks 1 1 1
Km 0
map_Kd /Maps/Form3_texture.jpg
newmtl default_floor
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/antenna_04_01_01_01.jpg
newmtl default_city_base
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/dr2b_01_01_01.jpg
newmtl default_access
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/derf1_01_01_01.jpg
newmtl default_water_canal
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/fl1.jpg
newmtl default_tubes_city_base.2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/sc1_01_01_01.jpg
newmtl default_city_base.2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/aw2.jpg
newmtl default_glass_city_base.2
d 0.8
Ns 1
Ni 0
Ka 0 0 0
Kd 0 0 0
Ks 1 1 1
Km 0
newmtl default_lamp_poles_city_base.2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_lights_city_base.2
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_Area_city_base.2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 0.156863 0.14902 0.176471
Ks 1 1 1
Km 0
map_Kd /Maps/Form3_texture.jpg
newmtl default_floor_city_base.2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/antenna_04_01_01_01.jpg
newmtl default_city_base_city_base.2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/dr2b_01_01_01.jpg
newmtl default_access_city_base.2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/derf1_01_01_01.jpg
newmtl default_water_canal_city_base.2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/fl1.jpg
newmtl default_tubes_city_base.2_1
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/sc1_01_01_01.jpg
newmtl default_city_base.2_1
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/aw2.jpg
newmtl default_glass_city_base.2_1
d 0.8
Ns 1
Ni 0
Ka 0 0 0
Kd 0 0 0
Ks 1 1 1
Km 0
newmtl default_lamp_poles_city_base.2_1
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_lights_city_base.2_1
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_Area_city_base.2_1
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 0.156863 0.14902 0.176471
Ks 1 1 1
Km 0
map_Kd /Maps/Form3_texture.jpg
newmtl default_floor_city_base.2_1
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/antenna_04_01_01_01.jpg
newmtl default_city_base_city_base.2_1
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/dr2b_01_01_01.jpg
newmtl default_access_city_base.2_1
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/derf1_01_01_01.jpg
newmtl default_water_canal_city_base.2_1
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/fl1.jpg
newmtl default_tubes_city_base.2_2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/sc1_01_01_01.jpg
newmtl default_city_base.2_2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/aw2.jpg
newmtl default_glass_city_base.2_2
d 0.8
Ns 1
Ni 0
Ka 0 0 0
Kd 0 0 0
Ks 1 1 1
Km 0
newmtl default_lamp_poles_city_base.2_2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_lights_city_base.2_2
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
newmtl default_Area_city_base.2_2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 0.156863 0.14902 0.176471
Ks 1 1 1
Km 0
map_Kd /Maps/Form3_texture.jpg
newmtl default_floor_city_base.2_2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/antenna_04_01_01_01.jpg
newmtl default_city_base_city_base.2_2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/dr2b_01_01_01.jpg
newmtl default_access_city_base.2_2
d 1
Ns 0.75
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/derf1_01_01_01.jpg
newmtl default_water_canal_city_base.2_2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/fl1.jpg
newmtl default_city_bldgs.2
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/axcv1.jpg
newmtl default_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b12.jpg
newmtl default_sign2
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b10.jpg
newmtl default_sign3
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b15b.jpg
newmtl default_sign4
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/v1.jpg
newmtl default_sign5
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/v2.jpg
newmtl default_sign6
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/d1.jpg
newmtl default_sign7
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/g3.jpg
newmtl default_sign8
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/g1.jpg
newmtl default_sign9
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/g4.jpg
newmtl default_sign10
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b9.jpg
newmtl default_holders
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 0 0 0
Ks 1 1 1
Km 0
newmtl default_sign_mult_1
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/a2.jpg
newmtl default_sign2_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/a5.jpg
newmtl default_sign3_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/a7.jpg
newmtl default_sign4_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/a9.jpg
newmtl default_sign5_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b1.jpg
newmtl default_sign6_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b4.jpg
newmtl default_sign7_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b8.jpg
newmtl default_sign8_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b13.jpg
newmtl default_sign9_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/b14.jpg
newmtl default_sign10_sign_mult
d 1
Ns 1
Ni 0
Ka 1 1 1
Kd 1 1 1
Ks 1 1 1
Km 0
map_Kd /Maps/a4.jpg
newmtl default_holders_sign_mult
d 1
Ns 1
Ni 0
Ka 0 0 0
Kd 0 0 0
Ks 1 1 1
Km 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

View File

@ -1,72 +0,0 @@
newmtl wooddark0
Ka 0 0 0
Ns 4.73772
Ks 0.623529 0.639216 0.560784
Kd 0.161551 0.0413659 0.00220712
map_Kd wooddark0.jpg
newmtl wooddark1
Ka 0 0 0
Ns 4.73772
Ks 0.623529 0.639216 0.560784
Kd 0.161551 0.0413659 0.00220712
map_Kd wooddark1_1.jpg
newmtl wooddark2
Ka 0 0 0
Ns 4.73772
Ks 0.623529 0.639216 0.560784
Kd 0.161551 0.0413659 0.00220712
map_Kd wooddark2_2.jpg
newmtl wooddark3
Ka 0 0 0
Ns 4.73772
Ks 0.623529 0.639216 0.560784
Kd 0.161551 0.0413659 0.00220712
map_Kd wooddark3_3.jpg
newmtl wooddark4
Ka 0 0 0
Ns 4.73772
Ks 0.623529 0.639216 0.560784
Kd 0.161551 0.0413659 0.00220712
map_Kd wooddark4_4.jpg
newmtl wooddark5
Ka 0 0 0
Ns 4.73772
Ks 0.623529 0.639216 0.560784
Kd 0.161551 0.0413659 0.00220712
map_Kd wooddark5_5.jpg
newmtl woodlight0
Ka 0 0 0
Ns 37.0071
Ks 0.623529 0.639216 0.560784
Kd 0.646162 0.565369 0.434441
map_Kd woodlight0_6.jpg
newmtl woodlight1
Ka 0 0 0
Ns 37.0071
Ks 0.623529 0.639216 0.560784
Kd 0.646162 0.565369 0.434441
map_Kd woodlight1_7.jpg
newmtl woodlight2
Ka 0 0 0
Ns 37.0071
Ks 0.623529 0.639216 0.560784
Kd 0.646162 0.565369 0.434441
map_Kd woodlight2_8.jpg
newmtl woodlight3
Ka 0 0 0
Ns 37.0071
Ks 0.623529 0.639216 0.560784
Kd 0.646162 0.565369 0.434441
map_Kd woodlight3_9.jpg
newmtl woodlight4
Ka 0 0 0
Ns 37.0071
Ks 0.623529 0.639216 0.560784
Kd 0.646162 0.565369 0.434441
map_Kd woodlight4_10.jpg
newmtl woodlight5
Ka 0 0 0
Ns 37.0071
Ks 0.623529 0.639216 0.560784
Kd 0.646162 0.565369 0.434441
map_Kd woodlight5_11.jpg

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 870 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 983 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 870 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 983 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

View File

@ -1,48 +0,0 @@
<html>
<head>
<title>OpenStreetMap Base Layer</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="geoObject.js" type="module"></script>
<link rel="stylesheet" href="../../css/og.css" type="text/css"/>
<style>
body {
padding: 0;
margin: 0;
}
.ginput {
position: relative;
padding: 10px;
display: flex;
flex-direction: row;
}
.ginput input {
width: 150px;
font-size: 1.3em;
}
.ginput div {
width: 100px;
}
</style>
</head>
<body>
<div id="earth" style="position: absolute; width:100%;height:100%"></div>
<!--<div style="font-size: 1.3em; background: white; position: absolute; right:100px; top:20px;display: flex;flex-direction: column">-->
<!-- <div class="ginput">-->
<!-- <div>PITCH</div>-->
<!-- <input type="number" class="gpitch" value="0"/></div>-->
<!-- <div class="ginput">-->
<!-- <div>YAW</div>-->
<!-- <input type="number" class="gyaw" value="0"/></div>-->
<!-- <div class="ginput">-->
<!-- <div>ROLL</div>-->
<!-- <input type="number" class="groll" value="0"/></div>-->
<!--</div>-->
</body>
</html>

View File

@ -1,182 +0,0 @@
import {
Globe,
control,
GlobusRgbTerrain,
Vector,
OpenStreetMap,
Entity,
Bing,
Object3d,
input,
Vec3
} from "../../lib/@openglobus/og.esm.js";
window.Vec3 = Vec3;
let cranesLayer = new Vector("crane", {
scaleByDistance: [1, 1, 1]
});
async function main() {
let sat = new Bing();
let osm = new OpenStreetMap();
const base = Object3d.createCube(0.4, 2, 0.4).translate(new Vec3(0, 1, 0));
const view = Object3d.createFrustum(3, 2, 1);
//const view2 = Object3d.createFrustum(3, 2, 1);
// let parentEntity = new Entity({
// cartesian: new Vec3(1, 1, 1),
// independentPicking: true,
// geoObject: {
// scale: 1,
// instanced: true,
// tag: `base`,
// object3d: base
// }
// });
//
// let childEntity = new Entity({
// cartesian: new Vec3(0, 1, 0),
// independentPicking: true,
// relativePosition: true,
// geoObject: {
// instanced: true,
// tag: `view`,
// object3d: view,
// }
// });
//
// let childChildEntity = new Entity({
// cartesian: new Vec3(0, 3, -1),
// independentPicking: true,
// relativePosition: true,
// geoObject: {
// instanced: true,
// tag: `view`,
// object3d: view
// }
// });
//
// childEntity.appendChild(childChildEntity);
// parentEntity.appendChild(childEntity);
const globus = new Globe({
//frustums: [[0.01, 0.1 + 0.0075], [0.1, 1 + 0.075], [1, 100 + 0.075], [100, 1000 + 0.075], [1000, 1e6 + 10000], [1e6, 1e9]],
target: "earth",
name: "Earth",
terrain: new GlobusRgbTerrain(),
layers: [sat, osm, cranesLayer],
//atmosphereEnabled: true,
fontsSrc: "../../res/fonts",
sun: {
stopped: false
},
//viewExtent: [33.1758537, 69.0755299, 33.2251571, 69.08960050]
});
//
globus.planet.addControl(new control.DebugInfo());
globus.planet.addControl(new control.KeyboardNavigation());
globus.planet.addControl(new control.LayerSwitcher());
globus.planet.addControl(new control.TimelineControl());
globus.planet.addControl(new control.GeoObjectEditor());
globus.planet.addControl(new control.ToggleWireframe());
globus.planet.addControl(new control.Lighting());
let cubeLayer = new Vector("Cubes", {
scaleByDistance: [20, 590000, 1]
//scaleByDistance: [1, 1, 1]
});
cubeLayer.addTo(globus.planet);
globus.renderer.events.on("mousemove", (e) => {
if (globus.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
let cart = globus.planet.getCartesianFromMouseTerrain();
let lonLat1 = globus.planet.ellipsoid.cartesianToLonLat(cart);
let entities = cubeLayer.getEntities();
for (let i = 0; i < entities.length; i++) {
let childEntity = entities[i].childEntities[0];
let childEntity2 = childEntity.childEntities[0];
childEntity.setLook3v(cart);
// let lonLat0 = childEntity.getLonLat();
//
// let inv = globus.planet.ellipsoid.inverse(lonLat0, lonLat1);
// childEntity.setAbsoluteYaw(inv.initialAzimuth);
//
// let pitch = childEntity.getAbsoluteCartesian().normal().negateTo().angle(cart.sub(childEntity.getAbsoluteCartesian()).normalize()) * 180 / Math.PI;
// childEntity.setAbsolutePitch(-90 + pitch);
//
// pitch = childEntity2.getAbsoluteCartesian().normal().negateTo().angle(cart.sub(childEntity2.getAbsoluteCartesian()).normalize()) * 180 / Math.PI;
// childEntity2.setAbsolutePitch(-90 + pitch);
}
}
});
globus.renderer.events.on("lclick", (e) => {
//if (e.pickingObject.geoObject) return;
let cart = globus.planet.getCartesianFromMouseTerrain();
if (cart) {
globus.renderer.setRelativeCenter(globus.planet.camera.eye);
if (globus.renderer.events.isKeyPressed(input.KEY_CTRL)) {
let parentEntity = new Entity({
cartesian: cart,
independentPicking: true,
geoObject: {
scale: 1,
instanced: true,
tag: `base`,
object3d: base,
}
});
let childEntity = new Entity({
cartesian: new Vec3(0, 1, 0),
independentPicking: true,
relativePosition: true,
geoObject: {
instanced: true,
tag: `view`,
object3d: view,
}
});
let childChildEntity = new Entity({
cartesian: new Vec3(0, 3, -1),
independentPicking: true,
relativePosition: true,
geoObject: {
instanced: true,
tag: `view`,
object3d: view,
}
});
childEntity.appendChild(childChildEntity);
parentEntity.appendChild(childEntity);
cubeLayer.add(parentEntity);
// let counter = 0;
// globus.planet.renderer.events.on("draw", () => {
// childEntity.setYaw(-counter);
// childChildEntity.setYaw(counter);
// counter += 0.4;
// })
}
}
})
}
main();

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +0,0 @@
# Blender MTL File: '01 Residential Buildings Set Array.blend'
# Material Count: 2
newmtl ground
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd C:\Users\DH\Desktop\Residential Buildings Set\textures\Hotel_Hous_AO.png
map_Bump -bm 0.172933 -s 10.000000 10.000000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_N.jpg
map_Ks C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\Steel_S.jpg
newmtl hotel_glas
Ns 96.078431
Ka 1.000000 1.000000 1.000000
Kd 0.640000 0.640000 0.640000
Ks 0.000000 0.000000 0.000000
Ke 0.344000 0.344000 0.344000
Ni 1.000000
d 0.300000
illum 1
refl -s 0.800000 0.800000 1.000000 C:\\Users\\DH\\Desktop\\Residential Buildings Set\\textures\\REF 1.jpg

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 544 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 439 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 601 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

View File

@ -1,63 +0,0 @@
<html>
<head>
<title>OpenGlobus - Mars planet</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="../../lib/@openglobus/og.css" type="text/css"/>
</head>
</html>
<body>
<div id="globus"></div>
<script type="module" id="og-sandbox-script">
'use strict';
import {
Globe,
EmptyTerrain,
XYZ,
control,
RgbTerrain,
quadTreeStrategyType,
mars
} from "../../lib/@openglobus/og.esm.js";
const sat = new XYZ("OSM", {
'isBaseLayer': true,
//'url': "https://astro.arcgis.com/arcgis/rest/services/OnMars/MDIM/MapServer/tile/{z}/{y}/{x}?blankTile=false",
url: "https://terrain.openglobus.org/mars/sat/{z}/{x}/{y}.png",
'visibility': true,
maxNativeZoom: 8,
});
var highResTerrain = new RgbTerrain(null, {
geoidSrc: null,
maxNativeZoom: 8,
maxZoom: 8,
url: "https://terrain.openglobus.org/mars/dem/{z}/{x}/{y}.png",
heightFactor: 1
});
window.globe = new Globe({
ellipsoid: mars,
name: "mars",
quadTreeStrategyPrototype: quadTreeStrategyType.equi,
target: "globus",
terrain: highResTerrain,
layers: [sat],
nightTextureSrc: null,
specularTextureSrc: null,
atmosphereEnabled: false
});
globe.planet.addControl(new control.ToggleWireframe());
globe.planet.addControl(new control.DebugInfo());
globe.planet.addControl(new control.Lighting());
globe.planet.renderer.controls.SimpleSkyBackground.colorOne = "rgb(0, 0, 0)";
globe.planet.renderer.controls.SimpleSkyBackground.colorTwo = "rgb(0, 0, 0)";
</script>
</body>

View File

@ -1 +0,0 @@
{"type": "FeatureCollection", "features": [{"type": "Feature", "properties": {"name": "Tycho", "diameter": 86}, "geometry": {"type": "Point", "coordinates": [-11.2, -43.3]}}, {"type": "Feature", "properties": {"name": "Copernicus", "diameter": 93}, "geometry": {"type": "Point", "coordinates": [-20.1, 9.7]}}, {"type": "Feature", "properties": {"name": "Kepler", "diameter": 31}, "geometry": {"type": "Point", "coordinates": [-38.0, 8.1]}}, {"type": "Feature", "properties": {"name": "Aristarchus", "diameter": 40}, "geometry": {"type": "Point", "coordinates": [-47.4, 23.7]}}, {"type": "Feature", "properties": {"name": "Ptolemaeus", "diameter": 153}, "geometry": {"type": "Point", "coordinates": [-1.9, -9.2]}}, {"type": "Feature", "properties": {"name": "Clavius", "diameter": 231}, "geometry": {"type": "Point", "coordinates": [-14.1, -58.6]}}, {"type": "Feature", "properties": {"name": "Eratosthenes", "diameter": 58}, "geometry": {"type": "Point", "coordinates": [-11.3, 14.5]}}, {"type": "Feature", "properties": {"name": "Aristillus", "diameter": 55}, "geometry": {"type": "Point", "coordinates": [1.2, 33.9]}}, {"type": "Feature", "properties": {"name": "Plinius", "diameter": 44}, "geometry": {"type": "Point", "coordinates": [23.6, 15.4]}}, {"type": "Feature", "properties": {"name": "Grimaldi", "diameter": 173}, "geometry": {"type": "Point", "coordinates": [-68.3, -5.2]}}, {"type": "Feature", "properties": {"name": "Gagarin", "diameter": 265}, "geometry": {"type": "Point", "coordinates": [149.5, -20.2]}}, {"type": "Feature", "properties": {"name": "Newton", "diameter": 79}, "geometry": {"type": "Point", "coordinates": [-16.1, -77.5]}}, {"type": "Feature", "properties": {"name": "Schr\u00f6dinger", "diameter": 312}, "geometry": {"type": "Point", "coordinates": [132.4, -75.0]}}, {"type": "Feature", "properties": {"name": "Descartes", "diameter": 48}, "geometry": {"type": "Point", "coordinates": [15.7, -12.1]}}, {"type": "Feature", "properties": {"name": "Langrenus", "diameter": 132}, "geometry": {"type": "Point", "coordinates": [61.0, -8.9]}}, {"type": "Feature", "properties": {"name": "Schickard", "diameter": 227}, "geometry": {"type": "Point", "coordinates": [-54.5, -44.3]}}, {"type": "Feature", "properties": {"name": "Bailly", "diameter": 303}, "geometry": {"type": "Point", "coordinates": [-69.0, -66.4]}}, {"type": "Feature", "properties": {"name": "Clausius", "diameter": 25}, "geometry": {"type": "Point", "coordinates": [-17.6, -58.1]}}, {"type": "Feature", "properties": {"name": "Mendeleev", "diameter": 313}, "geometry": {"type": "Point", "coordinates": [141.0, 5.7]}}, {"type": "Feature", "properties": {"name": "Tsiolkovskiy", "diameter": 185}, "geometry": {"type": "Point", "coordinates": [128.9, -20.4]}}, {"type": "Feature", "properties": {"name": "Endymion", "diameter": 125}, "geometry": {"type": "Point", "coordinates": [56.5, 53.6]}}, {"type": "Feature", "properties": {"name": "Humboldt", "diameter": 207}, "geometry": {"type": "Point", "coordinates": [80.9, -27.0]}}, {"type": "Feature", "properties": {"name": "Joliot", "diameter": 175}, "geometry": {"type": "Point", "coordinates": [93.5, 24.2]}}, {"type": "Feature", "properties": {"name": "Maunder", "diameter": 55}, "geometry": {"type": "Point", "coordinates": [-88.6, -14.6]}}, {"type": "Feature", "properties": {"name": "Oppenheimer", "diameter": 208}, "geometry": {"type": "Point", "coordinates": [-166.3, -35.1]}}, {"type": "Feature", "properties": {"name": "Pythagoras", "diameter": 145}, "geometry": {"type": "Point", "coordinates": [-63.7, 63.6]}}, {"type": "Feature", "properties": {"name": "Hertzsprung", "diameter": 570}, "geometry": {"type": "Point", "coordinates": [-128.0, 2.3]}}, {"type": "Feature", "properties": {"name": "D'Alembert", "diameter": 248}, "geometry": {"type": "Point", "coordinates": [-164.7, 51.5]}}, {"type": "Feature", "properties": {"name": "Stevinus", "diameter": 75}, "geometry": {"type": "Point", "coordinates": [54.5, -32.3]}}, {"type": "Feature", "properties": {"name": "Gauss", "diameter": 177}, "geometry": {"type": "Point", "coordinates": [79.0, 36.6]}}]}

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More