From eec24e8135a25a9657b940b2604486637c07038f Mon Sep 17 00:00:00 2001 From: Jeshurun Hembd Date: Wed, 31 Jan 2024 07:03:40 -0500 Subject: [PATCH 1/3] Update npm dependencies --- package.json | 10 +++++----- packages/engine/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0825ecbac421..d32dbd621c26 100644 --- a/package.json +++ b/package.json @@ -54,11 +54,11 @@ "@cesium/widgets": "^4.4.0" }, "devDependencies": { - "@playwright/test": "^1.40.1", + "@playwright/test": "^1.41.1", "chokidar": "^3.5.3", "cloc": "^2.8.0", "compression": "^1.7.4", - "esbuild": "^0.19.8", + "esbuild": "^0.20.0", "eslint": "^8.56.0", "eslint-config-cesium": "^10.0.1", "eslint-plugin-es": "^4.1.0", @@ -74,7 +74,7 @@ "gulp-replace": "^1.1.3", "gulp-tap": "^2.0.0", "gulp-zip": "^6.0.0", - "husky": "^8.0.2", + "husky": "^9.0.7", "istanbul-lib-instrument": "^6.0.0", "jasmine-core": "^5.0.1", "jsdoc": "^3.6.7", @@ -90,7 +90,7 @@ "karma-safari-launcher": "^1.0.0", "karma-sourcemap-loader": "^0.4.0", "karma-spec-reporter": "^0.0.36", - "markdownlint-cli": "^0.37.0", + "markdownlint-cli": "^0.39.0", "merge-stream": "^2.0.0", "mkdirp": "^3.0.1", "node-fetch": "^3.2.10", @@ -160,4 +160,4 @@ "packages/engine", "packages/widgets" ] -} \ No newline at end of file +} diff --git a/packages/engine/package.json b/packages/engine/package.json index e1bd2ab0968e..ae9382e21873 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -32,7 +32,7 @@ "./Specs/**/*" ], "dependencies": { - "@tweenjs/tween.js": "^21.0.0", + "@tweenjs/tween.js": "^23.1.1", "@zip.js/zip.js": "2.4.x", "autolinker": "^4.0.0", "bitmap-sdf": "^1.0.3", From 9fdf399be797b9d777f8ab4ce88773c5a00554bf Mon Sep 17 00:00:00 2001 From: Jeshurun Hembd Date: Wed, 31 Jan 2024 16:39:33 -0500 Subject: [PATCH 2/3] Update zip.js dependency --- packages/engine/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/engine/package.json b/packages/engine/package.json index ae9382e21873..261deb907846 100644 --- a/packages/engine/package.json +++ b/packages/engine/package.json @@ -33,7 +33,7 @@ ], "dependencies": { "@tweenjs/tween.js": "^23.1.1", - "@zip.js/zip.js": "2.4.x", + "@zip.js/zip.js": "^2.7.34", "autolinker": "^4.0.0", "bitmap-sdf": "^1.0.3", "dompurify": "^3.0.2", From f73ff1121e7985e17589d3b50a65bc680ec990ba Mon Sep 17 00:00:00 2001 From: Jeshurun Hembd Date: Wed, 31 Jan 2024 17:14:15 -0500 Subject: [PATCH 3/3] Fix markdown linting issues --- Documentation/CustomShaderGuide/README.md | 2 +- Documentation/FabricGuide/README.md | 54 +++++++++++------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Documentation/CustomShaderGuide/README.md b/Documentation/CustomShaderGuide/README.md index bec25d80b127..9b3c16137d99 100644 --- a/Documentation/CustomShaderGuide/README.md +++ b/Documentation/CustomShaderGuide/README.md @@ -261,7 +261,7 @@ with an `N`. | `TEXCOORD_N` | `texCoord_N` | `vec2` | Yes | Yes | `N`-th set of texture coordinates. | | `COLOR_N` | `color_N` | `vec4` | Yes | Yes | `N`-th set of vertex colors. This is always a `vec4`; if the model does not specify an alpha value, it is assumed to be 1. | | `JOINTS_N` | `joints_N` | `ivec4` | Yes | Yes | `N`-th set of joint indices | -| `WEIGHTS_N` | `weights_N` | `vec4` | +| `WEIGHTS_N` | `weights_N` | `vec4` | Yes | Yes | `N`-th set of weights | Custom attributes are also available, though they are renamed to use lowercase letters and underscores. For example, an attribute called `_SURFACE_TEMPERATURE` diff --git a/Documentation/FabricGuide/README.md b/Documentation/FabricGuide/README.md index 23cfefc1f34a..df7879d30e26 100644 --- a/Documentation/FabricGuide/README.md +++ b/Documentation/FabricGuide/README.md @@ -69,10 +69,10 @@ polygon.material.uniforms.color = Cesium.Color.WHITE; CesiumJS has several built-in materials. Two widely used ones are: -| Name | Screenshot | Description | -| :------ | :---------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------- | -| `Color` | | A single color, including alpha for translucency. | -| `Image` | | An image with or without an alpha channel such as .png or .jpg; a combination of diffuse, `rgb`, and alpha, `a`, components. | +| Name | Screenshot | Description | +| :------ | :---------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------- | +| `Color` | Color | A single color, including alpha for translucency. | +| `Image` | Image | An image with or without an alpha channel such as .png or .jpg; a combination of diffuse, `rgb`, and alpha, `a`, components. | All built-in materials can be created similar to how we used `Color` above. For example: @@ -98,44 +98,44 @@ polygon.material = new Cesium.Material({ Procedural texture materials procedurally compute patterns on the GPU so they do not rely on external image files. They represent both diffuse and alpha components. -| Name | Screenshot | Description | -| :------------- | :----------------------------------------------------- | :-------------------------------------------------------- | -| `Checkerboard` | | Checkerboard with alternating light and dark colors. | -| `Stripe` | | Alternating light and dark horizontal or vertical stripes | -| `Dot` | | A pattern of dots organized by row and column. | -| `Grid` | | A grid of lines, useful for displaying 3D volumes. | +| Name | Screenshot | Description | +| :------------- | :------------------------------------------------------------------------ | :-------------------------------------------------------- | +| `Checkerboard` | Checkerboard | Checkerboard with alternating light and dark colors. | +| `Stripe` | Stripe | Alternating light and dark horizontal or vertical stripes | +| `Dot` | Dot | A pattern of dots organized by row and column. | +| `Grid` | Grid | A grid of lines, useful for displaying 3D volumes. | ### Base Materials Base materials represent fine-grain fundamental material characteristics, such as how much incoming light is reflected in a single direction, i.e., the _specular intensity_, or how much light is emitted, i.e., the _emission_. These materials can be used as is, but are more commonly [combined](#combining-materials) using Fabric to create a more complex material. -| Name | Screenshot | Description | -| :------------ | :---------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `DiffuseMap` | | An image with `vec3` components defining incoming light that scatters evenly in all directions. | -| `SpecularMap` | | An image with a scalar component defining the intensity of incoming light reflecting in a single direction. This is used to make parts of the surface shiny, e.g., water vs. land. | -| `AlphaMap` | | An image with a scalar component defining the opacity of the material. This is used to make parts of the surface translucent or transparent, e.g., a fence. | -| `NormalMap` | | An image with `vec3` components defining the surface's normal in tangent coordinates. Normal mapping is used to add surface detail without adding geometry. | -| `BumpMap` | | An image with a scalar component defining heights. Like normal mapping, bump mapping is used to add surface detail without adding geometry by perturbing the normal based on differences in adjacent image pixels. | -| `EmissionMap` | | An image with `vec3` components defining light emitted by the material equally in all directions, e.g., lights in a long hallway. | +| Name | Screenshot | Description | +| :------------ | :---------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `DiffuseMap` | DiffuseMap | An image with `vec3` components defining incoming light that scatters evenly in all directions. | +| `SpecularMap` | SpecularMap | An image with a scalar component defining the intensity of incoming light reflecting in a single direction. This is used to make parts of the surface shiny, e.g., water vs. land. | +| `AlphaMap` | AlphaMap | An image with a scalar component defining the opacity of the material. This is used to make parts of the surface translucent or transparent, e.g., a fence. | +| `NormalMap` | NormalMap | An image with `vec3` components defining the surface's normal in tangent coordinates. Normal mapping is used to add surface detail without adding geometry. | +| `BumpMap` | BumpMap | An image with a scalar component defining heights. Like normal mapping, bump mapping is used to add surface detail without adding geometry by perturbing the normal based on differences in adjacent image pixels. | +| `EmissionMap` | EmissionMap | An image with `vec3` components defining light emitted by the material equally in all directions, e.g., lights in a long hallway. | ## Polyline Materials Polyline materials are materials that can only be added to lines. -| Name | Screenshot | Description | -| :---------------- | :-------------------------------- | :----------------------------------------------- | -| `PolylineArrow` | | Places an arrow head at the end point of a line. | -| `PolylineGlow` | | Makes glowing lines. | -| `PolylineOutline` | | Line outline. | +| Name | Screenshot | Description | +| :---------------- | :------------------------------------------------------ | :----------------------------------------------- | +| `PolylineArrow` | PolylineArrow | Places an arrow head at the end point of a line. | +| `PolylineGlow` | PolylineGlow | Makes glowing lines. | +| `PolylineOutline` | PolylineOutline | Line outline. | ### Misc Materials There are a few materials that do not fit into any other category. -| Name | Screenshot | Description | -| :------------ | :---------------------------------------------------- | :-------------------------------------- | -| `Water` | | Animating water with waves and ripples. | -| `RimLighting` | | Highlights the rim or silhouette. | +| Name | Screenshot | Description | +| :------------ | :---------------------------------------------------------------------- | :-------------------------------------- | +| `Water` | Water | Animating water with waves and ripples. | +| `RimLighting` | RimLighting | Highlights the rim or silhouette. | For more materials, see the [CesiumJS Materials Plugin](https://github.com/CesiumGS/cesium-materials-pack).