Skip to content

Commit 17ae469

Browse files
committed
Merge main into cesium.com
2 parents 7a24b91 + 57857b0 commit 17ae469

File tree

93 files changed

+6837
-2525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+6837
-2525
lines changed
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
cesium
2+
engine
3+
widgets
4+
playwright
5+
test
6+
chokidar
7+
cloc
8+
compression
9+
esbuild
10+
eslint
11+
config
12+
plugin
13+
html
14+
express
15+
globals
16+
globby
17+
glsl
18+
strip
19+
comments
20+
gulp
21+
clean
22+
css
23+
insert
24+
rename
25+
replace
26+
tap
27+
zip
28+
husky
29+
istanbul
30+
lib
31+
instrument
32+
jasmine
33+
core
34+
jsdoc
35+
karma
36+
chrome
37+
launcher
38+
coverage
39+
detect
40+
browsers
41+
edge
42+
firefox
43+
ie
44+
longest
45+
reporter
46+
safari
47+
sourcemap
48+
loader
49+
spec
50+
markdownlint
51+
cli
52+
merge
53+
stream
54+
mkdirp
55+
node
56+
fetch
57+
open
58+
prettier
59+
prismjs
60+
request
61+
rimraf
62+
sinon
63+
tsd
64+
typescript
65+
yargs
66+
tweenjs
67+
tween
68+
autolinker
69+
bitmap
70+
sdf
71+
dompurify
72+
draco3d
73+
earcut
74+
grapheme
75+
splitter
76+
jsep
77+
kdbush
78+
ktx
79+
parse
80+
lerc
81+
mersenne
82+
twister
83+
meshoptimizer
84+
pako
85+
protobufjs
86+
rbush
87+
topojson
88+
client
89+
urijs
90+
nosleep
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import { readFileSync, writeFileSync } from "fs";
2+
import path from "path";
3+
import { fileURLToPath } from "url";
4+
5+
// inspired by code in https://github.com/streetsidesoftware/cspell/issues/3215
6+
// this file just generates the word list file in this directory that contains
7+
// all our dependecy package names
8+
9+
const __filename = fileURLToPath(import.meta.url); // get the resolved path to the file
10+
const __dirname = path.dirname(__filename); // get the name of the directory
11+
12+
const packageJsons = [
13+
path.join(__dirname, "../package.json"),
14+
path.join(__dirname, "../packages/engine/package.json"),
15+
path.join(__dirname, "../packages/widgets/package.json"),
16+
];
17+
const words = packageJsons.reduce((acc, packageJsonPath) => {
18+
const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
19+
const packageNames = Object.keys(packageJson.dependencies ?? {}).concat(
20+
Object.keys(packageJson.devDependencies ?? {}),
21+
);
22+
// remove the @ org symbol and dashes to get just words in package names
23+
const setOfWords = packageNames
24+
.flatMap((name) => name.replace(/[@]/g, "").split(/\/|\-/))
25+
.map((word) => word.replace(".js", ""));
26+
setOfWords.forEach((word) => acc.add(word));
27+
return acc;
28+
}, new Set());
29+
30+
// if https://github.com/streetsidesoftware/vscode-spell-checker/issues/3002
31+
// ever gets addressed this can be used to auto-generate the list of package names
32+
// to pass to cspell directly. Right now it works in the CLI but not in the extension
33+
writeFileSync("./cspell-packages.txt", Array.from(words).join("\n"));

.vscode/cspell.json

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"version": "0.2",
3+
"language": "en",
4+
"allowCompoundWords": true,
5+
"caseSensitive": false,
6+
"files": [
7+
"**/*.js",
8+
"**/*.html",
9+
"**/*.css",
10+
"**/*.md"
11+
],
12+
"ignorePaths": [
13+
"node_modules/**",
14+
"**/ThirdParty/**",
15+
"**/Build/**",
16+
"Source/**",
17+
"CONTRIBUTORS.md",
18+
"**/LICENSE.md"
19+
],
20+
"useGitignore": true,
21+
"dictionaries": [
22+
"typescript",
23+
"node",
24+
"html",
25+
"css",
26+
"packages"
27+
],
28+
"dictionaryDefinitions": [
29+
{
30+
"name": "packages",
31+
"path": "./.cspell/cspell-packages.txt",
32+
"addWords": false
33+
}
34+
],
35+
"words": [
36+
"3DTILES",
37+
"aabb",
38+
"Amato",
39+
"bathymetric",
40+
"bitangent",
41+
"bitangents",
42+
"bivariate",
43+
"Bourke",
44+
"brdf",
45+
"cartesians",
46+
"cartographics",
47+
"cesiumjs",
48+
"comms",
49+
"cyclomatic",
50+
"czml",
51+
"dequantize",
52+
"dequantized",
53+
"dequantizes",
54+
"dijit",
55+
"DONT",
56+
"ecef",
57+
"EPSG",
58+
"fxaa",
59+
"glsl",
60+
"gltf",
61+
"iframes",
62+
"iife",
63+
"lerp",
64+
"Lilli",
65+
"MAXAR",
66+
"minifiers",
67+
"mipmapped",
68+
"mipmaps",
69+
"msaa",
70+
"noaa",
71+
"Occluder",
72+
"occluders",
73+
"octree",
74+
"octrees",
75+
"OITFS",
76+
"pako",
77+
"phong",
78+
"pjcozzi",
79+
"pnts",
80+
"quantizations",
81+
"reproject",
82+
"tada",
83+
"topo",
84+
"topojson",
85+
"Transitioner",
86+
"tridiagonal",
87+
"tweens",
88+
"uncentered",
89+
"uncompress",
90+
"unminified",
91+
"unproject",
92+
"unregisters",
93+
"unrenderable",
94+
"voxel",
95+
"WEBG",
96+
"xdescribe"
97+
]
98+
}

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"slevesque.shader",
66
"cesium.gltf-vscode",
77
"bierner.github-markdown-preview",
8-
"DavidAnson.vscode-markdownlint"
8+
"DavidAnson.vscode-markdownlint",
9+
"streetsidesoftware.code-spell-checker"
910
]
1011
}

Apps/Sandcastle/CesiumSandcastle.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ require({
2626
location: "../Apps/Sandcastle/ThirdParty",
2727
},
2828
],
29+
// @ts-expect-error
2930
}, [
3031
"CodeMirror/lib/codemirror",
3132
"dijit/Dialog",

Apps/Sandcastle/gallery/Atmosphere.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
background: rgba(42, 42, 42, 0.8);
2626
padding: 4px;
2727
border-radius: 4px;
28+
max-height: 80%;
29+
overflow-y: auto;
2830
}
2931
#toolbar input {
3032
vertical-align: middle;

Apps/Sandcastle/gallery/Bathymetry.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@
100100

101101
const scene = viewer.scene;
102102

103+
// Prevent the user from tilting beyond the ellipsoid surface
104+
scene.screenSpaceCameraController.maximumTiltAngle = Math.PI / 2.0;
105+
103106
const globe = scene.globe;
104107
globe.enableLighting = true;
105108
globe.maximumScreenSpaceError = 1.0; // Load higher resolution tiles for better seafloor shading

Apps/Sandcastle/gallery/CZML Model - Node Transformations.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
name: "CZML Model",
3737
version: "1.0",
3838
clock: {
39-
interval: "2015-01-01T00:00:00Z/2015-01-01T00:00:20Z",
40-
currentTime: "2015-01-01T00:00:00Z",
39+
interval: "2015-01-01T12:00:00Z/2015-01-01T12:00:20Z",
40+
currentTime: "2015-01-01T12:00:00Z",
4141
multiplier: 20,
4242
},
4343
},
@@ -55,7 +55,7 @@
5555
nodeTransformations: {
5656
Skeleton_arm_joint_L__3_: {
5757
rotation: {
58-
epoch: "2015-01-01T00:00:00Z",
58+
epoch: "2015-01-01T12:00:00Z",
5959
unitQuaternion: [
6060
0, -0.23381920887303329, -0.6909886782144156, -0.0938384854833712,
6161
0.6775378681547408, 10, -0.4924076887347565, -0.6304934596091216,

Apps/Sandcastle/gallery/Cesium Widget.html

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,27 @@
3737
// it does not include the animation, imagery selection,
3838
// and other widgets, nor does it depend on the third-party
3939
// Knockout library.
40-
const widget = new Cesium.CesiumWidget("cesiumContainer");
40+
const widget = new Cesium.CesiumWidget("cesiumContainer", {
41+
shouldAnimate: true,
42+
});
43+
44+
const position = Cesium.Cartesian3.fromDegrees(-123.0744619, 44.0503706, 500);
45+
const heading = Cesium.Math.toRadians(135);
46+
const pitch = 0;
47+
const roll = 0;
48+
const hpr = new Cesium.HeadingPitchRoll(heading, pitch, roll);
49+
const orientation = Cesium.Transforms.headingPitchRollQuaternion(position, hpr);
50+
51+
const entity = widget.entities.add({
52+
position: position,
53+
orientation: orientation,
54+
model: {
55+
uri: "../../SampleData/models/CesiumAir/Cesium_Air.glb",
56+
minimumPixelSize: 128,
57+
maximumScale: 20000,
58+
},
59+
});
60+
widget.trackedEntity = entity;
4161
//Sandcastle_End
4262
};
4363
if (typeof Cesium !== "undefined") {

0 commit comments

Comments
 (0)