diff --git a/src/experimental/filament/CMakeLists.txt b/src/experimental/filament/CMakeLists.txt index 8fe1ecac..59e8432f 100644 --- a/src/experimental/filament/CMakeLists.txt +++ b/src/experimental/filament/CMakeLists.txt @@ -32,10 +32,6 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} filament/filament_context.h filament/filament_platform_factory.cc filament/filament_platform_factory.h - filament/imgui_bridge.cc - filament/imgui_bridge.h - filament/imgui_editor.cc - filament/imgui_editor.h filament/light.cc filament/light.h filament/material.cc @@ -44,10 +40,6 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} filament/math_util.h filament/mesh.cc filament/mesh.h - filament/mjr_filament_renderer.cc - filament/mjr_filament_renderer.h - filament/model_objects.cc - filament/model_objects.h filament/model_util.h filament/object_manager.cc filament/object_manager.h @@ -55,14 +47,22 @@ target_sources(${MUJOCO_FILAMENT_TARGET_NAME} filament/render_target.h filament/renderable.cc filament/renderable.h - filament/scene_bridge.cc - filament/scene_bridge.h - filament/scene_geom_util.cc - filament/scene_geom_util.h filament/scene_view.cc filament/scene_view.h filament/texture.cc filament/texture.h + compat/imgui_bridge.cc + compat/imgui_bridge.h + compat/imgui_editor.cc + compat/imgui_editor.h + compat/mjr_filament_renderer.cc + compat/mjr_filament_renderer.h + compat/model_objects.cc + compat/model_objects.h + compat/scene_bridge.cc + compat/scene_bridge.h + compat/scene_geom_util.cc + compat/scene_geom_util.h ) if(MUJOCO_USE_FILAMENT_MJR_COMPAT) target_sources(${MUJOCO_FILAMENT_TARGET_NAME} diff --git a/src/experimental/filament/filament/imgui_bridge.cc b/src/experimental/filament/compat/imgui_bridge.cc similarity index 99% rename from src/experimental/filament/filament/imgui_bridge.cc rename to src/experimental/filament/compat/imgui_bridge.cc index 7a645be6..8b43a3a4 100644 --- a/src/experimental/filament/filament/imgui_bridge.cc +++ b/src/experimental/filament/compat/imgui_bridge.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/imgui_bridge.h" +#include "experimental/filament/compat/imgui_bridge.h" #include #include @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "experimental/filament/filament/material.h" #include "experimental/filament/filament/mesh.h" diff --git a/src/experimental/filament/filament/imgui_bridge.h b/src/experimental/filament/compat/imgui_bridge.h similarity index 92% rename from src/experimental/filament/filament/imgui_bridge.h rename to src/experimental/filament/compat/imgui_bridge.h index d205db5c..06807f68 100644 --- a/src/experimental/filament/filament/imgui_bridge.h +++ b/src/experimental/filament/compat/imgui_bridge.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_IMGUI_BRIDGE_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_IMGUI_BRIDGE_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_IMGUI_BRIDGE_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_IMGUI_BRIDGE_H_ #include #include @@ -72,4 +72,4 @@ void DrawTextAt(const char* text, float x, float y, float z); } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_IMGUI_BRIDGE_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_IMGUI_BRIDGE_H_ diff --git a/src/experimental/filament/filament/imgui_editor.cc b/src/experimental/filament/compat/imgui_editor.cc similarity index 99% rename from src/experimental/filament/filament/imgui_editor.cc rename to src/experimental/filament/compat/imgui_editor.cc index bfc773f4..dd707914 100644 --- a/src/experimental/filament/filament/imgui_editor.cc +++ b/src/experimental/filament/compat/imgui_editor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/imgui_editor.h" +#include "experimental/filament/compat/imgui_editor.h" #include #include @@ -34,8 +34,8 @@ #include #include #include +#include "experimental/filament/compat/scene_bridge.h" #include "experimental/filament/filament/color_grading_options.h" -#include "experimental/filament/filament/scene_bridge.h" #include "experimental/filament/filament/scene_view.h" namespace mujoco { diff --git a/src/experimental/filament/filament/imgui_editor.h b/src/experimental/filament/compat/imgui_editor.h similarity index 74% rename from src/experimental/filament/filament/imgui_editor.h rename to src/experimental/filament/compat/imgui_editor.h index f073fe45..3457fd26 100644 --- a/src/experimental/filament/filament/imgui_editor.h +++ b/src/experimental/filament/compat/imgui_editor.h @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_IMGUI_EDITOR_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_IMGUI_EDITOR_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_IMGUI_EDITOR_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_IMGUI_EDITOR_H_ -#include "experimental/filament/filament/scene_bridge.h" +#include "experimental/filament/compat/scene_bridge.h" namespace mujoco { @@ -24,4 +24,4 @@ void DrawGui(SceneBridge* scene_bridge); } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_IMGUI_EDITOR_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_IMGUI_EDITOR_H_ diff --git a/src/experimental/filament/filament/mjr_filament_renderer.cc b/src/experimental/filament/compat/mjr_filament_renderer.cc similarity index 96% rename from src/experimental/filament/filament/mjr_filament_renderer.cc rename to src/experimental/filament/compat/mjr_filament_renderer.cc index 8ca1ebe6..48242258 100644 --- a/src/experimental/filament/filament/mjr_filament_renderer.cc +++ b/src/experimental/filament/compat/mjr_filament_renderer.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/mjr_filament_renderer.h" +#include "experimental/filament/compat/mjr_filament_renderer.h" #include #include @@ -22,13 +22,13 @@ #include #include #include +#include "experimental/filament/compat/imgui_bridge.h" +#include "experimental/filament/compat/imgui_editor.h" +#include "experimental/filament/compat/scene_bridge.h" #include "experimental/filament/filament/draw_mode.h" #include "experimental/filament/filament/filament_context.h" -#include "experimental/filament/filament/imgui_bridge.h" -#include "experimental/filament/filament/imgui_editor.h" #include "experimental/filament/filament/model_util.h" #include "experimental/filament/filament/render_target.h" -#include "experimental/filament/filament/scene_bridge.h" #include "experimental/filament/filament/texture.h" #include "experimental/filament/render_context_filament.h" diff --git a/src/experimental/filament/filament/mjr_filament_renderer.h b/src/experimental/filament/compat/mjr_filament_renderer.h similarity index 87% rename from src/experimental/filament/filament/mjr_filament_renderer.h rename to src/experimental/filament/compat/mjr_filament_renderer.h index 205b8beb..a1c97edc 100644 --- a/src/experimental/filament/filament/mjr_filament_renderer.h +++ b/src/experimental/filament/compat/mjr_filament_renderer.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MJR_FILAMENT_RENDERER_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MJR_FILAMENT_RENDERER_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MJR_FILAMENT_RENDERER_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MJR_FILAMENT_RENDERER_H_ #include #include @@ -21,10 +21,9 @@ #include #include #include -#include "experimental/filament/filament/draw_mode.h" +#include "experimental/filament/compat/imgui_bridge.h" +#include "experimental/filament/compat/scene_bridge.h" #include "experimental/filament/filament/filament_context.h" -#include "experimental/filament/filament/imgui_bridge.h" -#include "experimental/filament/filament/scene_bridge.h" #include "experimental/filament/render_context_filament.h" namespace mujoco { @@ -84,4 +83,4 @@ class MjrFilamentRenderer : public FilamentContext { } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MJR_FILAMENT_RENDERER_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MJR_FILAMENT_RENDERER_H_ diff --git a/src/experimental/filament/filament/model_objects.cc b/src/experimental/filament/compat/model_objects.cc similarity index 99% rename from src/experimental/filament/filament/model_objects.cc rename to src/experimental/filament/compat/model_objects.cc index 742c3609..fb796882 100644 --- a/src/experimental/filament/filament/model_objects.cc +++ b/src/experimental/filament/compat/model_objects.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/model_objects.h" +#include "experimental/filament/compat/model_objects.h" #include #include diff --git a/src/experimental/filament/filament/model_objects.h b/src/experimental/filament/compat/model_objects.h similarity index 94% rename from src/experimental/filament/filament/model_objects.h rename to src/experimental/filament/compat/model_objects.h index d85693e3..db528d36 100644 --- a/src/experimental/filament/filament/model_objects.h +++ b/src/experimental/filament/compat/model_objects.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MODEL_OBJECTS_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MODEL_OBJECTS_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_ #include #include @@ -100,4 +100,4 @@ class ModelObjects { } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_MODEL_OBJECTS_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_MODEL_OBJECTS_H_ diff --git a/src/experimental/filament/filament/scene_bridge.cc b/src/experimental/filament/compat/scene_bridge.cc similarity index 98% rename from src/experimental/filament/filament/scene_bridge.cc rename to src/experimental/filament/compat/scene_bridge.cc index fd62b392..4f00828d 100644 --- a/src/experimental/filament/filament/scene_bridge.cc +++ b/src/experimental/filament/compat/scene_bridge.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/scene_bridge.h" +#include "experimental/filament/compat/scene_bridge.h" #include #include @@ -36,16 +36,15 @@ #include #include #include +#include "experimental/filament/compat/imgui_bridge.h" +#include "experimental/filament/compat/model_objects.h" +#include "experimental/filament/compat/scene_geom_util.h" #include "experimental/filament/filament/color_grading_options.h" -#include "experimental/filament/filament/imgui_bridge.h" #include "experimental/filament/filament/light.h" -#include "experimental/filament/filament/material.h" #include "experimental/filament/filament/math_util.h" -#include "experimental/filament/filament/model_objects.h" #include "experimental/filament/filament/model_util.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/renderable.h" -#include "experimental/filament/filament/scene_geom_util.h" #include "experimental/filament/filament/scene_view.h" #include "experimental/filament/filament/texture.h" diff --git a/src/experimental/filament/filament/scene_bridge.h b/src/experimental/filament/compat/scene_bridge.h similarity index 92% rename from src/experimental/filament/filament/scene_bridge.h rename to src/experimental/filament/compat/scene_bridge.h index 8c31de05..96e8ab31 100644 --- a/src/experimental/filament/filament/scene_bridge.h +++ b/src/experimental/filament/compat/scene_bridge.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_SCENE_BRIDGE_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_SCENE_BRIDGE_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_SCENE_BRIDGE_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_SCENE_BRIDGE_H_ #include #include @@ -24,8 +24,8 @@ #include #include #include +#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/filament/light.h" -#include "experimental/filament/filament/model_objects.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/renderable.h" #include "experimental/filament/filament/scene_view.h" @@ -85,4 +85,4 @@ class SceneBridge { } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_SCENE_BRIDGE_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_SCENE_BRIDGE_H_ diff --git a/src/experimental/filament/filament/scene_geom_util.cc b/src/experimental/filament/compat/scene_geom_util.cc similarity index 98% rename from src/experimental/filament/filament/scene_geom_util.cc rename to src/experimental/filament/compat/scene_geom_util.cc index 49f612af..527fe56f 100644 --- a/src/experimental/filament/filament/scene_geom_util.cc +++ b/src/experimental/filament/compat/scene_geom_util.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "experimental/filament/filament/scene_geom_util.h" +#include "experimental/filament/compat/scene_geom_util.h" #include #include @@ -22,20 +22,17 @@ #include #include -#include #include -#include #include #include #include #include -#include #include #include +#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/filament/material.h" #include "experimental/filament/filament/math_util.h" #include "experimental/filament/filament/mesh.h" -#include "experimental/filament/filament/model_objects.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/renderable.h" #include "experimental/filament/filament/texture.h" diff --git a/src/experimental/filament/filament/scene_geom_util.h b/src/experimental/filament/compat/scene_geom_util.h similarity index 76% rename from src/experimental/filament/filament/scene_geom_util.h rename to src/experimental/filament/compat/scene_geom_util.h index deef9c58..c702f687 100644 --- a/src/experimental/filament/filament/scene_geom_util.h +++ b/src/experimental/filament/compat/scene_geom_util.h @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_SCENE_GEOM_UTIL_H_ -#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_SCENE_GEOM_UTIL_H_ +#ifndef MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_SCENE_GEOM_UTIL_H_ +#define MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_SCENE_GEOM_UTIL_H_ #include #include -#include "experimental/filament/filament/material.h" -#include "experimental/filament/filament/model_objects.h" +#include "experimental/filament/compat/model_objects.h" #include "experimental/filament/filament/object_manager.h" #include "experimental/filament/filament/renderable.h" @@ -32,4 +31,4 @@ std::unique_ptr CreateGeomRenderable( } // namespace mujoco -#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_FILAMENT_SCENE_GEOM_UTIL_H_ +#endif // MUJOCO_SRC_EXPERIMENTAL_FILAMENT_COMPAT_SCENE_GEOM_UTIL_H_ diff --git a/src/experimental/filament/render_context_filament.cc b/src/experimental/filament/render_context_filament.cc index 10f0aa2b..65b4086a 100644 --- a/src/experimental/filament/render_context_filament.cc +++ b/src/experimental/filament/render_context_filament.cc @@ -21,7 +21,7 @@ #include #include #include -#include "experimental/filament/filament/mjr_filament_renderer.h" +#include "experimental/filament/compat/mjr_filament_renderer.h" #if defined(TLS_FILAMENT_CONTEXT)