Skip to content

Commit

Permalink
Merge branch 'main' of github.com:pupitetris/cesium-webxr
Browse files Browse the repository at this point in the history
  • Loading branch information
pupitetris committed Mar 4, 2024
2 parents 402fa1f + fbc056e commit 82ec4d3
Show file tree
Hide file tree
Showing 8 changed files with 275 additions and 333 deletions.
28 changes: 6 additions & 22 deletions .github/actions/check-for-CLA/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const main = async () => {

const response = await postCommentOnPullRequest(
hasSignedCLA,
errorFoundOnCLACheck
errorFoundOnCLACheck,
);
};

Expand All @@ -49,7 +49,7 @@ const checkIfUserHasSignedAnyCLA = async () => {
const checkIfIndividualCLAFound = async () => {
const response = await getValuesFromGoogleSheet(
GOOGLE_SHEETS_INFO.individualCLASheetId,
"D2:D"
"D2:D",
);

const rows = response.data.values;
Expand All @@ -70,7 +70,7 @@ const checkIfIndividualCLAFound = async () => {
const checkIfCorporateCLAFound = async () => {
const response = await getValuesFromGoogleSheet(
GOOGLE_SHEETS_INFO.corporateCLASheetId,
"H2:H"
"H2:H",
);

const rows = response.data.values;
Expand All @@ -85,7 +85,7 @@ const checkIfCorporateCLAFound = async () => {
const words = rowScheduleA.split(" ");

for (let j = 0; j < words.length; j++) {
// Checking for substrings cause many GitHub usernames added as "github.com/username".
// Checking for substrings because many GitHub usernames added as "github.com/username".
if (words[j].includes(PULL_REQUST_INFO.username.toLowerCase())) {
return true;
}
Expand All @@ -104,22 +104,6 @@ const getValuesFromGoogleSheet = async (sheetId, cellRanges) => {
});
};

const TEMP_KEY_OBJECT = {
type: "service_account",
project_id: "nifty-inn-314413",
private_key_id: "c0bb98a93e6c80ee2ec082c0914d96fe37217b72",
private_key:
"-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC/O3h3ned28/Dl\nKxDCYPqAuzeFENwI4swmK7zO/lTUh8BK8zg63ItyWaHCljvMJB7+MG3Fi9//LVnL\n8xKY35DdArG7UtQh1dTFkLMP4s+EkjKeadZNWMx+6XYm+Ye40Pc7B6jz2JUVz52y\nQjagtpned2I8TqlhHqEiwuJXhxAwvpDWDuDYiWcUI4Xlq8XWsv6Eu8iXk0JlE5NB\nj43GYGDo1XAVXASdj+f1RaQZRhHpUpFDkX6hCw6aaMfiTSj5cj2bPGHpYSqbun8R\nsmOiZEG/sG5ax0jBn3ho1fFddonPnYGMejniOzPSW+qr/GmB8XjFW63G6lvtYWrf\n/qH1/zPTAgMBAAECggEAHEtPpF3SqiunEDadANrvIC490AxnN1Fcj1FCsFsPxhpd\nKI8ar2rY9GRaphCAbHtJB/xhDCzenuzg2meZRXvep99cLgaFUzRGNQJshq8yW7/I\niYkd/M0PWhUaNuNjYhmuWtI5UfWmVAHR/Vav/9DErMEmjHG/EfBBkIPGkC4bBnsJ\nvFfPIo3AfyhonLFeSxB9PWjacMo2sxh4VdAr8baNKMl8zCd0vT4vjXBvNn8Li7k/\n3QTqV5gUBfkSCRQOlbhItb2FWnfSs558PVBUGWDKTkPsD5Ll40ZNnfhemU06or8k\nocnFbZmPVURwnzsiBGouE1zWYs90MIou3eBKdL5qAQKBgQD51lpuKvWY4aY3FD9J\npTNi8cfckunGcuL5e6EktAHNvudJvzeGL+em1gjiIs2cltBl/zCLvz6il9kbLhfc\nm+bgBIYNY7H3TmNGtadAeVyWQlK95ne/Cc64fTXYnfzevJNJNEvgrAF3xGL/44i0\n3MbEeVPJ9L7+xarjBFyap1xZUwKBgQDD8wtkD1w2eVxQG+jpn0Uhck0koYk8X53l\nw85LvBQVemaH5+LR+jDZTmg7Pb73CSDd0U2oZpDjrL9NLowT8aXOz/pzW9EadwFM\nSeZiorbbQ9Lh+l3KgEfYv2DBPyd5sBhwrUThWeAxjTZzmcykuodXM8DO1TNvCZaw\nenuHAc3rgQKBgBHA0qI7eUJI3pfRX4HrNFCWn74jzmrkpQ5XY6cJB4vIQgUyik6F\nvu9TDESNdpDnAp4M2TVE/L1vDuVojBeIGIrYp3HyIKZTMqjGpcDmHtcqlVibNO0l\nVEQ12YqwB1UIj2rHRZEMh/orwWEvmPpJKfKyMGsMcjoGb9M77xyqQdyzAoGBAL5n\nMtBd5JrCPqNRG3e33fLsIG3R0Yqq1sFnDNSmw1VDhNHWz5594G2oNLwr+Z4ObrNc\nKHvUfkHdoF4dNtxCWX2mtpTVyVBQByDcRlPeDJTvSMFxCSY2lJnXDOt6tJ8YMAd9\nNotLTACaWSjnb+U5oz1m+pmArePdi2GdAt9jL3cBAoGAV4k+3RuyQhB9go/JEogL\nNLoeznBHGPr6gjjVOJ7soFHb3MN2husL/6fTWzXbNUiQVQmMo5+hfuqLMEwAY0mi\n7BLszt34c+fu+cD51ywTy4zVIVQkyKY77AxquX+6lnaGT0oNMfHwj12jnUgHtVWk\nGfz0Q0isFwNwTFfX0BbVTws=\n-----END PRIVATE KEY-----\n",
client_email: "[email protected]",
client_id: "112198629386958476933",
auth_uri: "https://accounts.google.com/o/oauth2/auth",
token_uri: "https://oauth2.googleapis.com/token",
auth_provider_x509_cert_url: "https://www.googleapis.com/oauth2/v1/certs",
client_x509_cert_url:
"https://www.googleapis.com/robot/v1/metadata/x509/cla-checking-test%40nifty-inn-314413.iam.gserviceaccount.com",
universe_domain: "googleapis.com",
};

const getGoogleSheetsApiClient = async () => {
const googleConfigFilePath = "GoogleConfig.json";
fs.writeFileSync(googleConfigFilePath, GOOGLE_SHEETS_INFO.APIKeys);
Expand Down Expand Up @@ -148,14 +132,14 @@ const postCommentOnPullRequest = async (hasSignedCLA, errorFoundOnCLACheck) => {
accept: "application/vnd.github+json",
"X-GitHub-Api-Version": "2022-11-28",
},
}
},
);
};

const getCommentBody = (hasSignedCLA, errorFoundOnCLACheck) => {
const commentTemplate = fs.readFileSync(
"./.github/actions/check-for-CLA/templates/pullRequestComment.hbs",
"utf-8"
"utf-8",
);

const getCommentFromTemplate = Handlebars.compile(commentTemplate);
Expand Down
34 changes: 8 additions & 26 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
- Fixed a bug affecting voxel shader compilation in WebGL1 contexts. [#11798](https://github.com/CesiumGS/cesium/pull/11798)
- Fixed a bug where legacy B3DM files that contained glTF 1.0 data that used a `CONSTANT` technique in the `KHR_material_common` extension and only defined ambient- or emissive textures (but no diffuse textures) showed up without any texture [#11825](https://github.com/CesiumGS/cesium/pull/11825)
- Fixed an error when the `screenSpaceEventHandler` was destroyed before `Viewer` [#10576](https://github.com/CesiumGS/cesium/issues/10576)
- Fixes how `Camera.changed` handles changes in `roll`. [#11844](https://github.com/CesiumGS/cesium/pull/11844)
- Fixed how `Camera.changed` handles changes in `roll`. [#11844](https://github.com/CesiumGS/cesium/pull/11844)

##### Additions :tada:

- Added support for I3S Building Scene Layer. [#11678](https://github.com/CesiumGS/cesium/pull/11678)
- Added `Scene.pickVoxel` to pick individual cells from a `VoxelPrimitive`, and `VoxelCell` to report information about the picked cell. [#11828](https://github.com/CesiumGS/cesium/pull/11828)
- Added `Scene.defaultLogDepthbuffer` to allow changing the default behavior of the `logDepthBuffer` for newly created `Scene` instances. [#11859](https://github.com/CesiumGS/cesium/pull/11859)
- Added `Scene.defaultLogDepthBuffer` to allow changing the default behavior of the `logDepthBuffer` for newly created `Scene` instances. [#11859](https://github.com/CesiumGS/cesium/pull/11859)
- Added `SensorVolumePortionToDisplay` to assist `CzmlDataSource` in parsing CZML. [#11859](https://github.com/CesiumGS/cesium/pull/11859)

##### Deprecated :hourglass_flowing_sand:
Expand Down Expand Up @@ -86,32 +86,15 @@

#### @cesium/engine

##### Breaking Changes :mega:

- By default, the screen space camera controller will no longer go inside or under instances of `Cesium3DTileset`. [#11581](https://github.com/CesiumGS/cesium/pull/11581)
- This behavior can be disabled by setting `Cesium3DTileset.disableCameraCollision` to true.
- This feature is enabled by default only for WebGL 2 and above, but can be enabled for WebGL 1 by setting the `enablePick` option to true when creating the `Cesium3DTileset`.

##### Additions :tada:

- Vertical exaggeration can now be applied to a `Cesium3DTileset`. Exaggeration of `Terrain` and `Cesium3DTileset` can be controlled simultaneously via the new `Scene` properties `Scene.verticalExaggeration` and `Scene.verticalExaggerationRelativeHeight`. [#11655](https://github.com/CesiumGS/cesium/pull/11655)
- Added `Cesium3DTileset.getHeight` to sample height values of the loaded tiles. If using WebGL 1, the `enablePick` option must be set to true to use this function. [#11581](https://github.com/CesiumGS/cesium/pull/11581)
- Added `Cesium3DTileset.disableCameraCollision` to allow the camera from to go inside or below a 3D tileset, for instance, to be used with 3D Tiles interiors. [#11581](https://github.com/CesiumGS/cesium/pull/11581)
- Added `Cesium3DTileset.enableCameraCollision` to prevent the camera from going below a 3D tileset. Tilesets created with `createGooglePhotorealistic3DTileset` have this option enabled by default. [#11581](https://github.com/CesiumGS/cesium/pull/11581)
- Clamping to ground, `HeightReference.CLAMP_TO_GROUND`, and `HeightReference.RELATIVE_TO_GROUND` now take into account 3D Tilesets. These opions will clamp to either 3D Tilesets or Terrain, whichever has a greater height. [#11604](https://github.com/CesiumGS/cesium/pull/11604)
- Added `HeightReference.CLAMP_TO_TERRAIN`, `HeightReference.RELATIVE_TO_TERRAIN`, `HeightReference.CLAMP_TO_3D_TILE`, and `HeightReference.RELATIVE_TO_3D_TILE` to position relatve to terrain or 3D tilesets exclusively.[#11604](https://github.com/CesiumGS/cesium/pull/11604)
- Added `Cesium3DTileset.getHeight` to sample height values of the loaded tiles. If using WebGL 1, the `enablePick` option must be set to true to use this function. [#11581](https://github.com/CesiumGS/cesium/pull/11581)

##### Fixes :wrench:

- Changes the default `RequestScheduler.maximumRequestsPerServer` from 6 to 18. This should improve performance on HTTP/2 servers and above [#11627](https://github.com/CesiumGS/cesium/issues/11627)
- Corrected JSDoc and Typescript definitions that marked optional arguments as required in `ImageryProvider` constructor [#11625](https://github.com/CesiumGS/cesium/issues/11625)
- Changes the default `RequestScheduler.maximumRequestsPerServer` from 6 to 18. This should improve performance on HTTP/2 servers and above. [#11627](https://github.com/CesiumGS/cesium/issues/11627)
- Corrected JSDoc and Typescript definitions that marked optional arguments as required in `ImageryProvider` constructor. [#11625](https://github.com/CesiumGS/cesium/issues/11625)
- The `Quaternion.computeAxis` function created an axis that was `(0,0,0)` for the unit quaternion, and an axis that was `(NaN,NaN,NaN)` for the quaternion `(0,0,0,-1)` (which describes a rotation about 360 degrees). Now, it returns the x-axis `(1,0,0)` in both of these cases. [#11665](https://github.com/CesiumGS/cesium/issues/11665)
- Fix globe materials when lighting is false. Slope/Aspect material no longer rely on turning on lighting or shadows. [#11563](https://github.com/CesiumGS/cesium/issues/11563)
- Fixed a bug where the 3D Tiles Inspector's `dynamicScreenSpaceErrorDensity` slider did not update the tileset [#6143](https://github.com/CesiumGS/cesium/issues/6143)
- Updated the `PolylineGeometryUpdater` destroy function to properly remove destroyed `PolylineCollection` instances from the `Scene`. Additionally, updated `PolylineCollection` to address cases where destroy was invoked on a primitive that had already been destroyed. These changes resolve crashes reported under [#7758](https://github.com/CesiumGS/cesium/issues/7758) and [#9154](https://github.com/CesiumGS/cesium/issues/9154)
- `PolylineGeometryUpdater` now uses a distinct `PolylineCollection` instance per `CustomDataSource`. This resolves the crashes reported under [#7758](https://github.com/CesiumGS/cesium/issues/7758) and [#9154](https://github.com/CesiumGS/cesium/issues/9154).
- Fixed an issue where `CustomDataSource` objects all shared a single `PolylineCollection`. Updated `PolylineGeometryUpdater` to use a distinct `PolylineCollection` instance per `CustomDataSource`. This resolves the crashes reported under [#7758](https://github.com/CesiumGS/cesium/issues/7758) and [#9154](https://github.com/CesiumGS/cesium/issues/9154).

##### Deprecated :hourglass_flowing_sand:

Expand All @@ -130,6 +113,8 @@

#### @cesium/engine

##### Additions :tada:

- `BingMapsImageryProvider.fromUrl` now takes an optional `mapLayer` parameter which is a string that maps directly to the [mapLayer template parameters](https://learn.microsoft.com/en-us/bingmaps/rest-services/imagery/get-imagery-metadata#template-parameters) specified in the Bing Maps documentation.

##### Fixes :wrench:
Expand Down Expand Up @@ -172,7 +157,7 @@
- Added `PolygonGeometry.computeRectangleFromPositions` for computing a `Rectangle` that encloses a polygon, including cases over the international date line and the poles.
- Added `Stereographic` for computing 2D operations in stereographic, or polar, coordinates.
- Adds events to `PrimitiveCollection` for primitive added/removed. [#11531](https://github.com/CesiumGS/cesium/pull/11531)
- Adds an optional `rejectOnTileFail` parameter to `sampleTerrain()` to allow handling of tile request failures. [#11530](https://github.com/CesiumGS/cesium/pull/11530)
- Adds an optional `rejectOnTileFail` parameter to `sampleTerrain` and `sampleTerrainMostDetailed` to allow handling of tile request failures. [#11530](https://github.com/CesiumGS/cesium/pull/11530)

##### Fixes :wrench:

Expand All @@ -181,9 +166,6 @@
- Fixed bug in `Cesium3DTilePass` affecting the `PRELOAD` pass. [#11525](https://github.com/CesiumGS/cesium/pull/11525)
- Fixed bug where sky atmosphere could not be shown when `globe.show` is initialized to false. [#11266](https://github.com/CesiumGS/cesium/issues/11266)
- Fixed issue loading workers in cross-origin `Build/Cesium/Cesium.js` and `Build/CesiumUnminified/Cesium.js` requests. [#11505](https://github.com/CesiumGS/cesium/issues/11505)
- Fixed ground primitive polygon visual artifacts at pole. [#8033](https://github.com/CesiumGS/cesium/issues/8033)
- Fixed bug in `Cesium3DTilePass` affecting the `PRELOAD` pass. [#11525](https://github.com/CesiumGS/cesium/pull/11525)
- Fixed bug where sky atmosphere could not be shown when `globe.show` is initialized to false. [#11266](https://github.com/CesiumGS/cesium/issues/11266)
- Fixed `showOnScreen` behavior for `Model` and `Cesium3DTileset` credits. [#11538](https://github.com/CesiumGS/cesium/pull/11538)
- Remove reading of `import.meta` meta-property because webpack does not support it. [#11511](https://github.com/CesiumGS/cesium/pull/11511)
- Fixed label background rendering in request render mode. [#11529](https://github.com/CesiumGS/cesium/issues/11529)
Expand Down Expand Up @@ -1986,7 +1968,7 @@ _This is an npm-only release to fix a publishing issue_.
- This is to make clipping planes' coordinates always relative to the object they're attached to. So if you were positioning the clipping planes as in the example below, this is no longer necessary:
```javascript
clippingPlanes.modelMatrix = Cesium.Transforms.eastNorthUpToFixedFrame(
tileset.boundingSphere.center
tileset.boundingSphere.center,
);
```
- This also fixes several issues with clipping planes not using the correct transform for tilesets with children.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -373,11 +373,11 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
- [hongfaqiu](https://github.com/hongfaqiu)
- [KOBAYASHI Ittoku](https://github.com/kittoku)
- [王康](https://github.com/yieryi)
- [Subhajit Saha](https://github.com/subhajits)
- [rropp5](https://github.com/rropp5)
- [孙永政](https://github.com/syzdev)
- [Subhajit Saha](https://github.com/subhajits)
- [Jared Webber](https://github.com/jaredwebber)
- [Anne Gropler](https://github.com/anne-gropler)
- [rropp5](https://github.com/rropp5)
- [Harsh Lakhara](https://github.com/harshlakhara)
- [Pavlo Skakun](https://github.com/p-skakun)
- [Taylor Huffman](https://github.com/huffmantayler)
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@
"prismjs": "^1.28.0",
"request": "^2.79.0",
"rimraf": "^5.0.0",
"rollup": "^3.23.0",
"rollup-plugin-strip-pragma": "^1.0.0",
"sinon": "^17.0.0",
"stream-to-promise": "^3.0.0",
"tsd-jsdoc": "^2.5.0",
Expand Down Expand Up @@ -162,4 +160,4 @@
"packages/engine",
"packages/widgets"
]
}
}
Loading

0 comments on commit 82ec4d3

Please sign in to comment.