Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

February npm updates #11804

Merged
merged 3 commits into from
Jan 31, 2024
Merged

February npm updates #11804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eec24e8
Update npm dependencies
Jan 31, 2024
9fdf399
Update zip.js dependency
Jan 31, 2024
f73ff11
Fix markdown linting issues
Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/CustomShaderGuide/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
54 changes: 27 additions & 27 deletions Documentation/FabricGuide/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` | <img src="Color.png" width="200" height="92" /> | A single color, including alpha for translucency. |
| `Image` | <img src="Image.png" width="200" height="92" /> | 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` | <img src="Color.png" width="200" height="92" alt="Color" /> | A single color, including alpha for translucency. |
| `Image` | <img src="Image.png" width="200" height="92" alt="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:

Expand All @@ -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` | <img src="Checkerboard.png" width="200" height="92" /> | Checkerboard with alternating light and dark colors. |
| `Stripe` | <img src="Stripe.png" width="200" height="92" /> | Alternating light and dark horizontal or vertical stripes |
| `Dot` | <img src="Dot.png" width="200" height="92" /> | A pattern of dots organized by row and column. |
| `Grid` | <img src="Grid.png" width="200" height="92" /> | A grid of lines, useful for displaying 3D volumes. |
| Name | Screenshot | Description |
| :------------- | :------------------------------------------------------------------------ | :-------------------------------------------------------- |
| `Checkerboard` | <img src="Checkerboard.png" width="200" height="92" alt="Checkerboard" /> | Checkerboard with alternating light and dark colors. |
| `Stripe` | <img src="Stripe.png" width="200" height="92" alt="Stripe" /> | Alternating light and dark horizontal or vertical stripes |
| `Dot` | <img src="Dot.png" width="200" height="92" alt="Dot" /> | A pattern of dots organized by row and column. |
| `Grid` | <img src="Grid.png" width="200" height="92" alt="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` | <img src="DiffuseMap.png" width="200" height="92" /> | An image with `vec3` components defining incoming light that scatters evenly in all directions. |
| `SpecularMap` | <img src="SpecularMap.png" width="200" height="92" /> | 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` | <img src="AlphaMap.png" width="200" height="92" /> | 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` | <img src="NormalMap.png" width="200" height="92" /> | 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` | <img src="BumpMap.png" width="200" height="92" /> | 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` | <img src="EmissionMap.png" width="200" height="92" /> | 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` | <img src="DiffuseMap.png" width="200" height="92" alt="DiffuseMap" /> | An image with `vec3` components defining incoming light that scatters evenly in all directions. |
| `SpecularMap` | <img src="SpecularMap.png" width="200" height="92" alt="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` | <img src="AlphaMap.png" width="200" height="92" alt="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` | <img src="NormalMap.png" width="200" height="92" alt="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` | <img src="BumpMap.png" width="200" height="92" alt="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` | <img src="EmissionMap.png" width="200" height="92" alt="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` | <img src="PolylineArrow.png" /> | Places an arrow head at the end point of a line. |
| `PolylineGlow` | <img src="PolylineGlow.png" /> | Makes glowing lines. |
| `PolylineOutline` | <img src="PolylineOutline.png" /> | Line outline. |
| Name | Screenshot | Description |
| :---------------- | :------------------------------------------------------ | :----------------------------------------------- |
| `PolylineArrow` | <img src="PolylineArrow.png" alt="PolylineArrow" /> | Places an arrow head at the end point of a line. |
| `PolylineGlow` | <img src="PolylineGlow.png" alt="PolylineGlow" /> | Makes glowing lines. |
| `PolylineOutline` | <img src="PolylineOutline.png" alt="PolylineOutline" /> | Line outline. |

### Misc Materials

There are a few materials that do not fit into any other category.

| Name | Screenshot | Description |
| :------------ | :---------------------------------------------------- | :-------------------------------------- |
| `Water` | <img src="Water.png" width="200" height="92" /> | Animating water with waves and ripples. |
| `RimLighting` | <img src="RimLighting.png" width="200" height="92" /> | Highlights the rim or silhouette. |
| Name | Screenshot | Description |
| :------------ | :---------------------------------------------------------------------- | :-------------------------------------- |
| `Water` | <img src="Water.png" width="200" height="92" alt="Water" /> | Animating water with waves and ripples. |
| `RimLighting` | <img src="RimLighting.png" width="200" height="92" alt="RimLighting" /> | Highlights the rim or silhouette. |

For more materials, see the [CesiumJS Materials Plugin](https://github.com/CesiumGS/cesium-materials-pack).

Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -160,4 +160,4 @@
"packages/engine",
"packages/widgets"
]
}
}
4 changes: 2 additions & 2 deletions packages/engine/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"./Specs/**/*"
],
"dependencies": {
"@tweenjs/tween.js": "^21.0.0",
"@zip.js/zip.js": "2.4.x",
"@tweenjs/tween.js": "^23.1.1",
"@zip.js/zip.js": "^2.7.34",
"autolinker": "^4.0.0",
"bitmap-sdf": "^1.0.3",
"dompurify": "^3.0.2",
Expand Down
Loading