Skip to content

Commit

Permalink
Merge tag '1.113' into cesium.com
Browse files Browse the repository at this point in the history
1.113 release
  • Loading branch information
ggetz committed Jan 2, 2024
2 parents dfb150d + 9f43e81 commit 1520a39
Show file tree
Hide file tree
Showing 97 changed files with 2,060 additions and 930 deletions.
28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Report a bug
description: Let us know so we can fix it!
labels: ["needs triage", "type - bug"]
body:
- type: markdown
attributes:
value: |
Thanks for helping us improve CesiumJS! Please describe what the expected behavior is vs what actually happens.
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
validations:
required: true
- type: textarea
id: repro
attributes:
label: Reproduction steps
description: "How do you trigger this bug? Please walk us through it step by step."
value: |
1.
2.
3.
...
- type: input
id: sandcastle
attributes:
label: Sandcastle example
description: Creating a Sandcastle example (https://sandcastle.cesium.com) that reproduces the issue helps us a lot in tracking down bugs. Paste the link you get from the "Share" button in Sandcastle below.
placeholder: ex. https://sandcastle.cesium.com/...
validations:
required: false
- type: textarea
id: environment
attributes:
label: Environment
description: What Browsers, OS, and CesiumJS version are you experiencing this issue on?
value: |
Browser:
CesiumJS Version:
Operating System:
- type: markdown
attributes:
value: |
If you can also contribute a fix, we'd absolutely appreciate it! Fixing a bug in CesiumJS often means fixing a bug for thousands of applications and millions of end users.
Check out the contributor guide to get started: [CONTRIBUTING.md](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md)
Just let us know you're working on it and we'd be happy to provide advice and feedback.
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Request a feature
description: New ideas & improvements to CesiumJS are always welcome.
labels: ["needs triage", "type - enhancement"]
body:
- type: markdown
attributes:
value: |
Thanks for helping make CesiumJS better!
When suggesting an idea, give examples of the intended use case. Features that benefit the wider community are more likely to be prioritized.
- type: textarea
id: new-feature
attributes:
label: Feature
validations:
required: true
- type: markdown
attributes:
value: |
The best way to get your ideas into CesiumJS is to help us! We love contributions and are always happy to be provide feedback and advice. Check out the contributor guide to get started: [CONTRIBUTING.md](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md)
6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/question.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Ask a question
description: Please use the community forum (https://community.cesium.com/) for general questions about using CesiumJS.
labels: ["needs triage"]
body:
- type: markdown
attributes:
value: |
:exclamation: Please use the [community forum](https://community.cesium.com/) for asking questions about how to use CesiumJS and best practices. The core CesiumJS team actively monitors the forum and we love seeing what people are working on! :exclamation:
- type: checkboxes
id: verify
attributes:
label: Verification
description: Confirm you will ask your question on our forums linked above
options:
- label: "Yes"
35 changes: 35 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!--
Thanks for the Pull Request!
Please review [Contribution Guide](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md) before opening your first Pull Request.
To ensure your Pull Request is reviewed and accepted quickly, please refer to our [Pull Request Guidelines](https://github.com/CesiumGS/cesium/blob/main/CONTRIBUTING.md#pull-request-guidelines).
-->

# Description

<!-- Describe your changes in detail -->

<!-- Consider: Why is this change required? What problem does it solve? -->

<!-- Include screenshots if appropriate -->

## Issue number and link

<!-- If it fixes an open issue, link to the issue here -->

<!-- Consider: If suggesting a new feature or change, discuss it in an issue first. -->

## Testing plan

<!-- Describe in detail how you tested your changes. If this fixes a bug, list the steps to reproduce the original issue. -->

# Author checklist

- [ ] I have submitted a Contributor License Agreement
- [ ] I have added my name to `CONTRIBUTORS.md`
- [ ] I have updated `CHANGES.md` with a short summary of my change
- [ ] I have added or updated unit tests to ensure consistent code coverage
- [ ] I have update the inline documentation, and included code examples where relevant
- [ ] I have performed a self-review of my code
17 changes: 16 additions & 1 deletion .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,22 @@ jobs:
- uses: ./.github/actions/verify-package
- name: deploy to s3
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: npm run deploy-s3 -- -b "cesium-public-builds" -d cesium/$BRANCH -c 'no-cache' --confirm
run: |
aws s3 sync . s3://cesium-public-builds/cesium/$BRANCH/ \
--cache-control "no-cache" \
--exclude ".git/*" \
--exclude ".concierge/*" \
--exclude ".github/*" \
--exclude ".husky/*" \
--exclude ".vscode/*" \
--exclude "Build/Coverage/*" \
--exclude "Build/CesiumDev/*" \
--exclude "Build/Specs/e2e" \
--exclude "Documentation/*" \
--exclude "node_modules/*" \
--exclude "scripts/*" \
--exclude "Tools/*" \
--delete
- name: set status
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: npm run deploy-status -- --status success --message Deployed
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,10 @@ jobs:
run: npm run build-apps
- name: deploy to cesium.com
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
run: npm run deploy-s3 -- -b "cesium.com-next" -c 'public, max-age=1800' --skip --confirm
run: |
curl -LO $(curl https://api.github.com/repos/CesiumGS/cesium/releases/latest -H "Authorization: ${GITHUB_TOKEN}" | jq -r '.assets[0].browser_download_url')
unzip Cesium-$(cat package.json | jq -r '.version' | sed 's/\.0$//').zip -d Build/release/ -x "Apps"
aws s3 sync Build/release/ s3://cesium-website/cesiumjs/releases/$(cat package.json | jq -r '.version' | sed 's/\.0$//')/ --cache-control "public, max-age=1800" --delete
aws s3 sync Build/Documentation/ s3://cesium-website/cesiumjs/ref-doc/ --cache-control "public, max-age=1800" --delete
aws s3 sync Build/CesiumViewer/ s3://cesium-website/cesiumjs/cesium-viewer/ --cache-control "public, max-age=1800" --delete
aws s3 sync Build/Sandcastle/ s3://cesium-sandcastle-website/ --cache-control "public, max-age=1800" --delete
8 changes: 7 additions & 1 deletion .slackbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,11 @@ releaseSchedule:
- ggetz, 3/1/2023
- jjhembd, 4/3/2023
- ggetz, 5/1/2023
-jjhembd, 6/1/2023
- jjhembd, 6/1/2023
- ggetz, 7/1/2023
- jjhembd, 8/1/2023
- ggetz, 9/1/2023
- jjhembd, 10/1/2023
- ggetz, 11/1/2023
- jjhembd, 12/1/2023
- ggetz, 1/2/2024
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
/>
<meta
name="description"
content="Load a 3D Tile Next tileset converted from CDB."
content="Load a 3D Tiles 1.1 tileset converted from CDB."
/>
<meta name="cesium-sandcastle-labels" content="3D Tiles Next" />
<meta name="cesium-sandcastle-labels" content="3D Tiles" />
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script
Expand Down Expand Up @@ -383,13 +383,13 @@
}

try {
// 3D Tiles Next converted from CDB of Aden, Yemen (CDB provided by Presagis)
// 3D Tiles 1.1 converted from CDB of Aden, Yemen (CDB provided by Presagis)
const terrainTileset = await Cesium.Cesium3DTileset.fromIonAssetId(
667809
2389063
);
viewer.scene.primitives.add(terrainTileset);
const buildingsTileset = await Cesium.Cesium3DTileset.fromIonAssetId(
666747,
2389064,
{
maximumScreenSpaceError: 12,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
name="description"
content="Load a photogrammetry dataset with feature ID textures from EXT_mesh_features."
/>
<meta name="cesium-sandcastle-labels" content="3D Tiles Next" />
<meta name="cesium-sandcastle-labels" content="3D Tiles" />
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script
Expand Down Expand Up @@ -65,7 +65,7 @@

let tileset;
try {
tileset = await Cesium.Cesium3DTileset.fromIonAssetId(775877);
tileset = await Cesium.Cesium3DTileset.fromIonAssetId(2333904);

const translation = new Cesium.Cartesian3(
-1.398521324920626,
Expand Down Expand Up @@ -120,10 +120,10 @@
const int PILLARS = 9;
const int STREET_LIGHT = 10;
const int TRAFFIC_LIGHT = 11;
void fragmentMain(FragmentInput fsInput, inout czm_modelMaterial material) {
int featureId = fsInput.featureIds.featureId_0;
if (featureId == CLOCK) {
// Shiny brass
material.specular = vec3(0.98, 0.90, 0.59);
Expand Down Expand Up @@ -169,7 +169,7 @@
const int NOTHING_SELECTED = 12;
void fragmentMain(FragmentInput fsInput, inout czm_modelMaterial material) {
int featureId = fsInput.featureIds.featureId_0;
if (u_selectedFeature < NOTHING_SELECTED && featureId == u_selectedFeature) {
material.specular = vec3(1.00, 0.85, 0.57);
material.roughness = 0.1;
Expand All @@ -193,16 +193,16 @@
const vec3 PURPLE = vec3(0.5, 0.0, 1.0);
const vec3 YELLOW = vec3(1.0, 1.0, 0.0);
const vec3 NO_TINT = vec3(1.0);
void fragmentMain(FragmentInput fsInput, inout czm_modelMaterial material) {
int featureId0 = fsInput.featureIds.featureId_0; // fine features
int featureId1 = fsInput.featureIds.featureId_1; // coarse features
// use both feature ID sets to determine where the features are
float isWindow = float(featureId0 == IDS0_WINDOW);
float isFacade = float(featureId1 == IDS1_FACADE);
float isRoof = float(featureId1 == IDS1_ROOF);
// Tint the roof windows yellow and facade windows purple
vec3 tint = NO_TINT;
tint = mix(tint, YELLOW, isWindow * isRoof);
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/3D Tiles 1.1 Photogrammetry.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
name="description"
content="Performance comparison of photogrammetry using 3D Tiles 1.0 vs 3D Tiles 1.1 with KTX2 texture compression. Most notably, KTX2 textures provide significant GPU memory savings"
/>
<meta name="cesium-sandcastle-labels" content="3D Tiles Next" />
<meta name="cesium-sandcastle-labels" content="3D Tiles" />
<title>3D Tiles 1.1 Photogrammetry</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
/>
<meta
name="description"
content="Load a global scale 3D Tiles Next tileset that uses 3DTILES_bounding_volume_S2."
content="Load a global scale 3D Tiles 1.1 tileset that uses 3DTILES_bounding_volume_S2."
/>
<meta name="cesium-sandcastle-labels" content="3D Tiles Next" />
<meta name="cesium-sandcastle-labels" content="3D Tiles" />
<title>Cesium Demo</title>
<script type="text/javascript" src="../Sandcastle-header.js"></script>
<script
Expand Down Expand Up @@ -77,7 +77,7 @@
let tileset;
try {
// MAXAR OWT WFF 1.2 Base Globe
tileset = await Cesium.Cesium3DTileset.fromIonAssetId(691510, {
tileset = await Cesium.Cesium3DTileset.fromIonAssetId(1208297, {
maximumScreenSpaceError: 4,
});
scene.primitives.add(tileset);
Expand Down
Loading

0 comments on commit 1520a39

Please sign in to comment.