Skip to content

Commit

Permalink
Merge pull request #12406 from CesiumGS/fix-env-tests
Browse files Browse the repository at this point in the history
Fix environment map tests
  • Loading branch information
lukemckinstry authored Jan 2, 2025
2 parents eea6385 + 080fd9c commit fb11067
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

##### Fixes :wrench:

- Fixed JulianDate to always generate valid ISO strings for fractional milliseconds [#12345](https://github.com/CesiumGS/cesium/pull/12345)
- Reduced memory usage and peformance bottlenecks when using environment maps with models. [#12356](https://github.com/CesiumGS/cesium/issues/12356)
- Fixed JulianDate to always generate valid ISO strings for fractional milliseconds. [#12345](https://github.com/CesiumGS/cesium/pull/12345)
- Fixed intermittent z-fighting issue. [#12337](https://github.com/CesiumGS/cesium/issues/12337)

### 1.124 - 2024-12-02
Expand Down
22 changes: 20 additions & 2 deletions packages/engine/Specs/Scene/DynamicEnvironmentMapManagerSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -269,6 +270,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -355,6 +357,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -442,6 +445,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
DynamicAtmosphereLightingType.SUNLIGHT;

scene.renderForSpecs(time);
scene.renderForSpecs(time);

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);

Expand Down Expand Up @@ -527,6 +531,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
DynamicAtmosphereLightingType.SUNLIGHT;

scene.renderForSpecs(time);
scene.renderForSpecs(time);

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);

Expand Down Expand Up @@ -614,6 +619,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -696,6 +702,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -779,6 +786,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -862,6 +870,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -945,6 +954,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -1028,6 +1038,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down Expand Up @@ -1075,8 +1086,14 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
);

expect(manager.sphericalHarmonicCoefficients[4].x).toBeLessThan(0.0);
expect(manager.sphericalHarmonicCoefficients[4].y).toBeLessThan(0.0);
expect(manager.sphericalHarmonicCoefficients[4].z).toBeLessThan(0.0);
expect(manager.sphericalHarmonicCoefficients[4].y).toEqualEpsilon(
0.0,
CesiumMath.EPSILON2,
);
expect(manager.sphericalHarmonicCoefficients[4].z).toEqualEpsilon(
0.0,
CesiumMath.EPSILON2,
);

expect(manager.sphericalHarmonicCoefficients[5].x).toBeGreaterThan(0.0);
expect(manager.sphericalHarmonicCoefficients[5].y).toBeGreaterThan(0.0);
Expand Down Expand Up @@ -1111,6 +1128,7 @@ describe("Scene/DynamicEnvironmentMapManager", function () {
const primitive = new EnvironmentMockPrimitive(manager);
scene.primitives.add(primitive);

scene.renderForSpecs();
scene.renderForSpecs();

expect(manager.radianceCubeMap).toBeInstanceOf(CubeMap);
Expand Down

0 comments on commit fb11067

Please sign in to comment.