chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure faces for meshes are correctly oriented.

Browse Source 
This is in preparation for a future CL that will disable backface culling.

PiperOrigin-RevId: 914136370
Change-Id: Ie8db1268faaa306c3f3356efc5e1305d791cf525
This commit is contained in:
Haroon Qureshi
2026-05-12 01:26:50 -07:00
committed by Copybara-Service
parent f9f1db1e0a
commit 5339d9154e
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/experimental/filament/compat/model_objects.cc
+6 -6
View File
@@ -254,17 +254,17 @@ static void FillHeightFieldBuffer(MeshBuilder& builder, const mjModel* model,
// Build the front edge.
for (int col = 0; col < ncol - 1; ++col) {
const float3 a = get_pos(0, col);
const float3 b = get_pos(0, col + 1);
const float3 c = {b.x, b.y, -sz[3]};
const float3 d = {a.x, a.y, -sz[3]};
const float3 b = {a.x, a.y, -sz[3]};
const float3 d = get_pos(0, col + 1);
const float3 c = {d.x, d.y, -sz[3]};
append_quad(a, b, c, d);
}
// Build the back edge.
for (int col = 0; col < ncol - 1; ++col) {
const float3 a = get_pos(nrow - 1, col + 1);
const float3 b = get_pos(nrow - 1, col);
const float3 c = {b.x, b.y, -sz[3]};
const float3 d = {a.x, a.y, -sz[3]};
const float3 b = {a.x, a.y, -sz[3]};
const float3 d = get_pos(nrow - 1, col);
const float3 c = {d.x, d.y, -sz[3]};
append_quad(a, b, c, d);
}
// Build the base. We use the visualization quality as the size rather than
src/experimental/filament/filament/builtins.cc
+10 -6
View File
@@ -153,7 +153,7 @@ class PlaneBuilder : public BuiltinBuilder {
const int i1 = base_idx + 1;
const int i2 = base_idx + num_quads_per_axis + 2;
const int i3 = base_idx + num_quads_per_axis + 1;
AppendQuadIndices(indices_, i0, i1, i2, i3);
AppendQuadIndices(indices_, i0, i3, i2, i1);
}
}
@@ -268,7 +268,11 @@ class BoxBuilder : public BuiltinBuilder {
const int i1 = base_idx + 1;
const int i2 = base_idx + num_quads_per_axis_ + 2;
const int i3 = base_idx + num_quads_per_axis_ + 1;
AppendQuadIndices(indices_, i0, i1, i2, i3);
if (i == 2 || i == 1 || i == 4) {
AppendQuadIndices(indices_, i0, i3, i2, i1);
} else {
AppendQuadIndices(indices_, i0, i1, i2, i3);
}
}
}
}
@@ -326,7 +330,7 @@ class TubeBuilder : public BuiltinBuilder {
const int i1 = base_idx + 1;
const int i2 = (base_idx + num_stacks + 2) % num_vertices;
const int i3 = (base_idx + num_stacks + 1) % num_vertices;
AppendQuadIndices(indices_, i0, i1, i2, i3);
AppendQuadIndices(indices_, i0, i3, i2, i1);
}
}
@@ -494,8 +498,8 @@ class SphereBuilder : public BuiltinBuilder {
for (int lon = 0; lon < num_slices; ++lon) {
const int next = lon < (num_slices - 1) ? lon + 1 : 0;
indices_.push_back(kNorthPoleIndex);
indices_.push_back(row_start + next);
indices_.push_back(row_start + lon);
indices_.push_back(row_start + next);
}
// Latitudinal triangle strips.
@@ -519,8 +523,8 @@ class SphereBuilder : public BuiltinBuilder {
for (int lon = 0; lon < num_slices; ++lon) {
const int adjacent = lon < (num_slices - 1) ? lon + 1 : 0;
indices_.push_back(kSouthPoleIndex);
indices_.push_back(row_start + lon);
indices_.push_back(row_start + adjacent);
indices_.push_back(row_start + lon);
}
SetBounds({-1, -1, -1}, {1, 1, 1});
@@ -585,8 +589,8 @@ class DomeBuilder : public BuiltinBuilder {
for (int lon = 0; lon < num_slices; ++lon) {
const int next = lon < (num_slices - 1) ? lon + 1 : 0;
indices_.push_back(kPoleIndex);
indices_.push_back(row_start + next);
indices_.push_back(row_start + lon);
indices_.push_back(row_start + next);
}
// Latitudinal quad strips. The first "stack" was handled above, so we