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

Remove old b3dm/i3dm/pnts content classes #10635

Merged
merged 6 commits into from
Aug 4, 2022
Merged

Remove old b3dm/i3dm/pnts content classes #10635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2c4a1e
Remove 1.0 contents
ptrgags Aug 3, 2022
0d4babc
Disable tests for Cesium3DTileBatchTable
ptrgags Aug 4, 2022
ec9ccec
Fix most existing specs
ptrgags Aug 4, 2022
1de3507
Fix composite content tests
ptrgags Aug 4, 2022
5101240
Merge branch 'replace-model' into remove-1.0-contents
ptrgags Aug 4, 2022
5f50db1
PR feedback
ptrgags Aug 4, 2022
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
489 changes: 0 additions & 489 deletions Source/Scene/Batched3DModel3DTileContent.js
View file
Open in desktop

This file was deleted.

36 changes: 3 additions & 33 deletions Source/Scene/Cesium3DTileContentFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import Batched3DModel3DTileContent from "./Batched3DModel3DTileContent.js";
import Composite3DTileContent from "./Composite3DTileContent.js";
import Geometry3DTileContent from "./Geometry3DTileContent.js";
import Implicit3DTileContent from "./Implicit3DTileContent.js";
import Instanced3DModel3DTileContent from "./Instanced3DModel3DTileContent.js";
import Model3DTileContent from "./ModelExperimental/Model3DTileContent.js";
import PointCloud3DTileContent from "./PointCloud3DTileContent.js";
import Tileset3DTileContent from "./Tileset3DTileContent.js";
import Vector3DTileContent from "./Vector3DTileContent.js";
import RuntimeError from "../Core/RuntimeError.js";
Expand All @@ -16,16 +13,7 @@ import RuntimeError from "../Core/RuntimeError.js";
*/
const Cesium3DTileContentFactory = {
b3dm: function (tileset, tile, resource, arrayBuffer, byteOffset) {
if (tileset.enableModelExperimental) {
return Model3DTileContent.fromB3dm(
tileset,
tile,
resource,
arrayBuffer,
byteOffset
);
}
return new Batched3DModel3DTileContent(
return Model3DTileContent.fromB3dm(
tileset,
tile,
resource,
Expand All @@ -34,16 +22,7 @@ const Cesium3DTileContentFactory = {
);
},
pnts: function (tileset, tile, resource, arrayBuffer, byteOffset) {
if (tileset.enableModelExperimental) {
return Model3DTileContent.fromPnts(
tileset,
tile,
resource,
arrayBuffer,
byteOffset
);
}
return new PointCloud3DTileContent(
return Model3DTileContent.fromPnts(
tileset,
tile,
resource,
Expand All @@ -52,16 +31,7 @@ const Cesium3DTileContentFactory = {
);
},
i3dm: function (tileset, tile, resource, arrayBuffer, byteOffset) {
if (tileset.enableModelExperimental) {
return Model3DTileContent.fromI3dm(
tileset,
tile,
resource,
arrayBuffer,
byteOffset
);
}
return new Instanced3DModel3DTileContent(
return Model3DTileContent.fromI3dm(
tileset,
tile,
resource,
Expand Down
Loading