Skip to content

Basic support for glTF LINES primitive mode #1704

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Basic support for glTF LINES primitive mode #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 17 additions & 7 deletions Source/CesiumRuntime/Private/CesiumGltfComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,7 @@ getIndices(const TIndexAccessor& indicesView, int32 primitiveMode) {
break;
case CesiumGltf::MeshPrimitive::Mode::TRIANGLES:
case CesiumGltf::MeshPrimitive::Mode::POINTS:
case CesiumGltf::MeshPrimitive::Mode::LINES:
default:
indices.SetNum(static_cast<TArray<uint32>::SizeType>(indicesView.size()));
for (int32 i = 0; i < indicesView.size(); ++i) {
Expand Down Expand Up @@ -1360,6 +1361,7 @@ static void loadPrimitive(

switch (primitive.mode) {
case CesiumGltf::MeshPrimitive::Mode::POINTS:
case CesiumGltf::MeshPrimitive::Mode::LINES:
case CesiumGltf::MeshPrimitive::Mode::TRIANGLES:
case CesiumGltf::MeshPrimitive::Mode::TRIANGLE_STRIP:
case CesiumGltf::MeshPrimitive::Mode::TRIANGLE_FAN:
Expand Down Expand Up @@ -1540,8 +1542,10 @@ static void loadPrimitive(
bool needToGenerateFlatNormals = normalsAreRequired && !hasNormals;
bool needToGenerateTangents = needsTangents && !hasTangents;
bool duplicateVertices = needToGenerateFlatNormals || needToGenerateTangents;
duplicateVertices = duplicateVertices &&
primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS;
duplicateVertices =
duplicateVertices &&
primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS &&
primitive.mode != CesiumGltf::MeshPrimitive::Mode::LINES;

uint32 numVertices =
duplicateVertices ? uint32(indices.Num()) : uint32(positionView.size());
Expand Down Expand Up @@ -1759,7 +1763,8 @@ static void loadPrimitive(
section.MinVertexIndex = 0;
section.MaxVertexIndex = numVertices - 1;
section.bEnableCollision =
primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS;
primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS &&
primitive.mode != CesiumGltf::MeshPrimitive::Mode::LINES;
section.bCastShadow = true;
section.MaterialIndex = 0;

Expand All @@ -1786,7 +1791,8 @@ static void loadPrimitive(
#if ENGINE_VERSION_5_5_OR_HIGHER
// UE 5.5 requires that we do this in order to avoid a crash when ray
// tracing is enabled.
if (primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS) {
if (primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS &&
primitive.mode != CesiumGltf::MeshPrimitive::Mode::LINES) {
// UE 5.5 requires that we do this in order to avoid a crash when ray
// tracing is enabled.
RenderData->InitializeRayTracingRepresentationFromRenderingLODs();
Expand All @@ -1800,7 +1806,7 @@ static void loadPrimitive(

primitiveResult.transform = transform * yInvertMatrix * scaleMatrix;

if (primitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS &&
if (section.bEnableCollision &&
options.pMeshOptions->pNodeOptions->pModelOptions->createPhysicsMeshes) {
if (numVertices != 0 && indices.Num() != 0) {
TRACE_CPUPROFILER_EVENT_SCOPE(Cesium::ChaosCook)
Expand Down Expand Up @@ -3040,9 +3046,12 @@ static void loadPrimitiveGameThreadPart(

UStaticMeshComponent* pMesh = nullptr;
ICesiumPrimitive* pCesiumPrimitive = nullptr;
if (meshPrimitive.mode == CesiumGltf::MeshPrimitive::Mode::POINTS) {
if (meshPrimitive.mode == CesiumGltf::MeshPrimitive::Mode::POINTS ||
meshPrimitive.mode == CesiumGltf::MeshPrimitive::Mode::LINES) {
UCesiumGltfPointsComponent* pPointMesh =
NewObject<UCesiumGltfPointsComponent>(pGltf, componentName);
pPointMesh->bLinesList =
(meshPrimitive.mode == CesiumGltf::MeshPrimitive::Mode::LINES);
pPointMesh->UsesAdditiveRefinement =
tile.getRefine() == Cesium3DTilesSelection::TileRefine::Add;
pPointMesh->GeometricError = static_cast<float>(tile.getGeometricError());
Expand Down Expand Up @@ -3114,7 +3123,8 @@ static void loadPrimitiveGameThreadPart(
// sense, but if Unreal will crash trying to generate ray tracing
// information for a static mesh without triangles.
pStaticMesh->bSupportRayTracing =
meshPrimitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS;
meshPrimitive.mode != CesiumGltf::MeshPrimitive::Mode::POINTS &&
meshPrimitive.mode != CesiumGltf::MeshPrimitive::Mode::LINES;
pMesh->SetStaticMesh(pStaticMesh);

pStaticMesh->SetFlags(
Expand Down
2 changes: 1 addition & 1 deletion Source/CesiumRuntime/Private/CesiumGltfPointsComponent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ FPrimitiveSceneProxy* UCesiumGltfPointsComponent::CreateSceneProxy() {
}

FCesiumGltfPointsSceneProxy* Proxy =
new FCesiumGltfPointsSceneProxy(this, GetScene()->GetFeatureLevel());
new FCesiumGltfPointsSceneProxy(this, GetScene()->GetFeatureLevel(), bLinesList);

FCesiumGltfPointsSceneProxyTilesetData TilesetData;
TilesetData.UpdateFromComponent(this);
Expand Down
2 changes: 2 additions & 0 deletions Source/CesiumRuntime/Private/CesiumGltfPointsComponent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class UCesiumGltfPointsComponent : public UCesiumGltfPrimitiveComponent {
// error.
glm::vec3 Dimensions;

bool bLinesList = false;

// Override UPrimitiveComponent interface.
virtual FPrimitiveSceneProxy* CreateSceneProxy() override;
};
20 changes: 14 additions & 6 deletions Source/CesiumRuntime/Private/CesiumGltfPointsSceneProxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ void FCesiumGltfPointsSceneProxyTilesetData::UpdateFromComponent(
UsesAdditiveRefinement = Component->UsesAdditiveRefinement;
GeometricError = Component->GeometricError;
Dimensions = Component->Dimensions;
bLinesList = Component->bLinesList;
}

SIZE_T FCesiumGltfPointsSceneProxy::GetTypeHash() const {
Expand All @@ -35,11 +36,12 @@ SIZE_T FCesiumGltfPointsSceneProxy::GetTypeHash() const {

FCesiumGltfPointsSceneProxy::FCesiumGltfPointsSceneProxy(
UCesiumGltfPointsComponent* InComponent,
ERHIFeatureLevel::Type InFeatureLevel)
ERHIFeatureLevel::Type InFeatureLevel,
bool bLinesList)
: FPrimitiveSceneProxy(InComponent),
RenderData(InComponent->GetStaticMesh()->GetRenderData()),
NumPoints(RenderData->LODResources[0].IndexBuffer.GetNumIndices()),
bAttenuationSupported(
bAttenuationSupported(!bLinesList &&
RHISupportsManualVertexFetch(GetScene().GetShaderPlatform())),
TilesetData(),
AttenuationVertexFactory(
Expand Down Expand Up @@ -116,6 +118,7 @@ uint32 FCesiumGltfPointsSceneProxy::GetMemoryFootprint(void) const {
void FCesiumGltfPointsSceneProxy::UpdateTilesetData(
const FCesiumGltfPointsSceneProxyTilesetData& InTilesetData) {
TilesetData = InTilesetData;
ensure(!TilesetData.bLinesList || !bAttenuationSupported); // see ctor
}

float FCesiumGltfPointsSceneProxy::GetGeometricError() const {
Expand Down Expand Up @@ -208,17 +211,22 @@ void FCesiumGltfPointsSceneProxy::CreateMesh(FMeshBatch& Mesh) const {
Mesh.VertexFactory = &RenderData->LODVertexFactories[0].VertexFactory;
Mesh.MaterialRenderProxy = Material->GetRenderProxy();
Mesh.ReverseCulling = IsLocalToWorldDeterminantNegative();
Mesh.Type = PT_PointList;
Mesh.Type = TilesetData.bLinesList ? PT_LineList : PT_PointList;
Mesh.DepthPriorityGroup = SDPG_World;
Mesh.LODIndex = 0;
Mesh.bCanApplyViewModeOverrides = false;
Mesh.bUseAsOccluder = false;
Mesh.bWireframe = false;
Mesh.bWireframe = TilesetData.bLinesList;

FMeshBatchElement& BatchElement = Mesh.Elements[0];
BatchElement.IndexBuffer = &RenderData->LODResources[0].IndexBuffer;
BatchElement.NumPrimitives = NumPoints;
BatchElement.FirstIndex = 0;
BatchElement.MinVertexIndex = 0;
BatchElement.MaxVertexIndex = BatchElement.NumPrimitives - 1;
BatchElement.MaxVertexIndex = NumPoints - 1;
if (TilesetData.bLinesList) {
ensure((NumPoints % 2) == 0);
BatchElement.NumPrimitives = NumPoints / 2;
} else {
BatchElement.NumPrimitives = NumPoints;
}
}
4 changes: 3 additions & 1 deletion Source/CesiumRuntime/Private/CesiumGltfPointsSceneProxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ struct FCesiumGltfPointsSceneProxyTilesetData {
bool UsesAdditiveRefinement;
float GeometricError;
glm::vec3 Dimensions;
bool bLinesList;

FCesiumGltfPointsSceneProxyTilesetData();

Expand All @@ -36,7 +37,8 @@ class FCesiumGltfPointsSceneProxy final : public FPrimitiveSceneProxy {

FCesiumGltfPointsSceneProxy(
UCesiumGltfPointsComponent* InComponent,
ERHIFeatureLevel::Type InFeatureLevel);
ERHIFeatureLevel::Type InFeatureLevel,
bool bLinesList);

virtual ~FCesiumGltfPointsSceneProxy();

Expand Down