Merge pull request #425 from aftersomemath:cull-face-flag

PiperOrigin-RevId: 466904386
Change-Id: Icd5515c2bbb8f8f3417501ea43c8e5ae22b32f91
This commit is contained in:
Copybara-Service
2022-08-11 02:44:37 -07:00
7 changed files with 16 additions and 5 deletions
+1
View File
@@ -875,6 +875,7 @@ mjtRndFlag
mjRND_HAZE, // haze
mjRND_SEGMENT, // segmentation with random color
mjRND_IDCOLOR, // segmentation with segid+1 color
mjRND_CULL_FACE, // cull backward faces
mjNRNDFLAG // number of rendering flags
} mjtRndFlag;
+1
View File
@@ -134,6 +134,7 @@ typedef enum mjtRndFlag_ { // flags enabling rendering effects
mjRND_HAZE, // haze
mjRND_SEGMENT, // segmentation with random color
mjRND_IDCOLOR, // segmentation with segid+1 color
mjRND_CULL_FACE, // cull backward faces
mjNRNDFLAG // number of rendering flags
} mjtRndFlag;
+2 -1
View File
@@ -624,7 +624,8 @@ ENUMS: Mapping[str, EnumDecl] = dict([
('mjRND_HAZE', 6),
('mjRND_SEGMENT', 7),
('mjRND_IDCOLOR', 8),
('mjNRNDFLAG', 9),
('mjRND_CULL_FACE', 9),
('mjNRNDFLAG', 10),
]),
)),
('mjtStereo',
+3 -1
View File
@@ -707,7 +707,9 @@ void makerendering(mj::Simulate* sim, int oldstate) {
mjui_add(&sim->ui0, defOpenGL);
for (i=0; i<mjNRNDFLAG; i++) {
mju::strcpy_arr(defFlag[0].name, mjRNDSTRING[i][0]);
mju::sprintf_arr(defFlag[0].other, " %s", mjRNDSTRING[i][2]);
if (mjRNDSTRING[i][2][0]) {
mju::sprintf_arr(defFlag[0].other, " %s", mjRNDSTRING[i][2]);
}
defFlag[0].pdata = sim->scn.flags + i;
mjui_add(&sim->ui0, defFlag);
}
+2 -1
View File
@@ -101,7 +101,8 @@ const char* mjRNDSTRING[mjNRNDFLAG][3] = {
{"Fog", "0", "G"},
{"Haze", "1", "/"},
{"Segment", "0", ","},
{"Id Color", "0", "."}
{"Id Color", "0", "."},
{"Cull Face", "1", ""}
};
+5 -1
View File
@@ -491,7 +491,11 @@ static void initGL3(const mjvScene* scn, const mjrContext* con) {
glEnable(GL_NORMALIZE);
glEnable(GL_DEPTH_TEST);
glDepthMask(GL_TRUE);
glEnable(GL_CULL_FACE);
if (scn->flags[mjRND_CULL_FACE]) {
glEnable(GL_CULL_FACE);
} else {
glDisable(GL_CULL_FACE);
}
glShadeModel(GL_SMOOTH);
glDepthFunc(GL_LEQUAL);
glDepthRange(0, 1);
+2 -1
View File
@@ -480,7 +480,8 @@ public enum mjtRndFlag : int{
mjRND_HAZE = 6,
mjRND_SEGMENT = 7,
mjRND_IDCOLOR = 8,
mjNRNDFLAG = 9,
mjRND_CULL_FACE = 9,
mjNRNDFLAG = 10,
}
public enum mjtStereo : int{
mjSTEREO_NONE = 0,