diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ee7f6b4..8bef8270 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ add_subdirectory(src/user) add_subdirectory(src/xml) add_subdirectory(src/thread) if(NOT EMSCRIPTEN AND NOT MUJOCO_USE_FILAMENT_MJR_COMPAT) - add_subdirectory(src/render) + add_subdirectory(src/render/classic) add_subdirectory(src/ui) endif() diff --git a/src/render/CMakeLists.txt b/src/render/classic/CMakeLists.txt similarity index 100% rename from src/render/CMakeLists.txt rename to src/render/classic/CMakeLists.txt diff --git a/src/render/font/back100.inc b/src/render/classic/font/back100.inc similarity index 100% rename from src/render/font/back100.inc rename to src/render/classic/font/back100.inc diff --git a/src/render/font/back150.inc b/src/render/classic/font/back150.inc similarity index 100% rename from src/render/font/back150.inc rename to src/render/classic/font/back150.inc diff --git a/src/render/font/back200.inc b/src/render/classic/font/back200.inc similarity index 100% rename from src/render/font/back200.inc rename to src/render/classic/font/back200.inc diff --git a/src/render/font/back250.inc b/src/render/classic/font/back250.inc similarity index 100% rename from src/render/font/back250.inc rename to src/render/classic/font/back250.inc diff --git a/src/render/font/back300.inc b/src/render/classic/font/back300.inc similarity index 100% rename from src/render/font/back300.inc rename to src/render/classic/font/back300.inc diff --git a/src/render/font/back50.inc b/src/render/classic/font/back50.inc similarity index 100% rename from src/render/font/back50.inc rename to src/render/classic/font/back50.inc diff --git a/src/render/font/big100.inc b/src/render/classic/font/big100.inc similarity index 100% rename from src/render/font/big100.inc rename to src/render/classic/font/big100.inc diff --git a/src/render/font/big150.inc b/src/render/classic/font/big150.inc similarity index 100% rename from src/render/font/big150.inc rename to src/render/classic/font/big150.inc diff --git a/src/render/font/big200.inc b/src/render/classic/font/big200.inc similarity index 100% rename from src/render/font/big200.inc rename to src/render/classic/font/big200.inc diff --git a/src/render/font/big250.inc b/src/render/classic/font/big250.inc similarity index 100% rename from src/render/font/big250.inc rename to src/render/classic/font/big250.inc diff --git a/src/render/font/big300.inc b/src/render/classic/font/big300.inc similarity index 100% rename from src/render/font/big300.inc rename to src/render/classic/font/big300.inc diff --git a/src/render/font/big50.inc b/src/render/classic/font/big50.inc similarity index 100% rename from src/render/font/big50.inc rename to src/render/classic/font/big50.inc diff --git a/src/render/font/normal100.inc b/src/render/classic/font/normal100.inc similarity index 100% rename from src/render/font/normal100.inc rename to src/render/classic/font/normal100.inc diff --git a/src/render/font/normal150.inc b/src/render/classic/font/normal150.inc similarity index 100% rename from src/render/font/normal150.inc rename to src/render/classic/font/normal150.inc diff --git a/src/render/font/normal200.inc b/src/render/classic/font/normal200.inc similarity index 100% rename from src/render/font/normal200.inc rename to src/render/classic/font/normal200.inc diff --git a/src/render/font/normal250.inc b/src/render/classic/font/normal250.inc similarity index 100% rename from src/render/font/normal250.inc rename to src/render/classic/font/normal250.inc diff --git a/src/render/font/normal300.inc b/src/render/classic/font/normal300.inc similarity index 100% rename from src/render/font/normal300.inc rename to src/render/classic/font/normal300.inc diff --git a/src/render/font/normal50.inc b/src/render/classic/font/normal50.inc similarity index 100% rename from src/render/font/normal50.inc rename to src/render/classic/font/normal50.inc diff --git a/src/render/glad/glad.c b/src/render/classic/glad/glad.c similarity index 99% rename from src/render/glad/glad.c rename to src/render/classic/glad/glad.c index 72bd6f78..e570906d 100644 --- a/src/render/glad/glad.c +++ b/src/render/classic/glad/glad.c @@ -53,7 +53,7 @@ #include #include #include "engine/engine_util_errmem.h" -#include "render/glad/glad.h" +#include "render/classic/glad/glad.h" static void* mjGlad_get_proc(const char *namez); diff --git a/src/render/glad/glad.h b/src/render/classic/glad/glad.h similarity index 99% rename from src/render/glad/glad.h rename to src/render/classic/glad/glad.h index 620a7cbb..419968bc 100644 --- a/src/render/glad/glad.h +++ b/src/render/classic/glad/glad.h @@ -39,8 +39,8 @@ // Online: // https://glad.dav1d.de/#profile=compatibility&language=c&specification=gl&loader=on&api=gl%3D1.5&extensions=GL_ARB_clip_control&extensions=GL_ARB_depth_buffer_float&extensions=GL_ARB_framebuffer_object&extensions=GL_ARB_seamless_cube_map&extensions=GL_ARB_vertex_buffer_object&extensions=GL_EXT_texture_sRGB&extensions=GL_KHR_debug -#ifndef MUJOCO_SRC_RENDER_GLAD_GLAD_H_ -#define MUJOCO_SRC_RENDER_GLAD_GLAD_H_ +#ifndef MUJOCO_SRC_RENDER_CLASSIC_GLAD_GLAD_H_ +#define MUJOCO_SRC_RENDER_CLASSIC_GLAD_GLAD_H_ #ifdef __gl_h_ #error OpenGL header already included, remove this include, glad already provides it @@ -2707,4 +2707,4 @@ GLAPI PFNGLGETPOINTERVKHRPROC mjGlad_glGetPointervKHR; } #endif -#endif // MUJOCO_SRC_RENDER_GLAD_GLAD_H_ +#endif // MUJOCO_SRC_RENDER_CLASSIC_GLAD_GLAD_H_ diff --git a/src/render/glad/loader.cc b/src/render/classic/glad/loader.cc similarity index 95% rename from src/render/glad/loader.cc rename to src/render/classic/glad/loader.cc index b69f944b..5eb1638e 100644 --- a/src/render/glad/loader.cc +++ b/src/render/classic/glad/loader.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "render/glad/glad.h" +#include "render/classic/glad/glad.h" extern "C" { diff --git a/src/render/render_context.c b/src/render/classic/render_context.c similarity index 98% rename from src/render/render_context.c rename to src/render/classic/render_context.c index faebe866..c7a5dd0b 100644 --- a/src/render/render_context.c +++ b/src/render/classic/render_context.c @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "render/render_context.h" +#include "render/classic/render_context.h" #include // IWYU pragma: keep #include @@ -23,28 +23,28 @@ #include #include #include -#include "render/render_util.h" -#include "render/glad/glad.h" +#include "render/classic/render_util.h" +#include "render/classic/glad/glad.h" // bitmap font definitions -#include "render/font/normal50.inc" -#include "render/font/normal100.inc" -#include "render/font/normal150.inc" -#include "render/font/normal200.inc" -#include "render/font/normal250.inc" -#include "render/font/normal300.inc" -#include "render/font/back50.inc" -#include "render/font/back100.inc" -#include "render/font/back150.inc" -#include "render/font/back200.inc" -#include "render/font/back250.inc" -#include "render/font/back300.inc" -#include "render/font/big50.inc" -#include "render/font/big100.inc" -#include "render/font/big150.inc" -#include "render/font/big200.inc" -#include "render/font/big250.inc" -#include "render/font/big300.inc" +#include "render/classic/font/normal50.inc" +#include "render/classic/font/normal100.inc" +#include "render/classic/font/normal150.inc" +#include "render/classic/font/normal200.inc" +#include "render/classic/font/normal250.inc" +#include "render/classic/font/normal300.inc" +#include "render/classic/font/back50.inc" +#include "render/classic/font/back100.inc" +#include "render/classic/font/back150.inc" +#include "render/classic/font/back200.inc" +#include "render/classic/font/back250.inc" +#include "render/classic/font/back300.inc" +#include "render/classic/font/big50.inc" +#include "render/classic/font/big100.inc" +#include "render/classic/font/big150.inc" +#include "render/classic/font/big200.inc" +#include "render/classic/font/big250.inc" +#include "render/classic/font/big300.inc" diff --git a/src/render/render_context.h b/src/render/classic/render_context.h similarity index 92% rename from src/render/render_context.h rename to src/render/classic/render_context.h index 6e29c096..364be1b4 100644 --- a/src/render/render_context.h +++ b/src/render/classic/render_context.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef MUJOCO_SRC_RENDER_RENDER_CONTEXT_H_ -#define MUJOCO_SRC_RENDER_RENDER_CONTEXT_H_ +#ifndef MUJOCO_SRC_RENDER_CLASSIC_RENDER_CONTEXT_H_ +#define MUJOCO_SRC_RENDER_CLASSIC_RENDER_CONTEXT_H_ #include #include @@ -69,4 +69,4 @@ MJAPI void mjr_uploadHField(const mjModel* m, const mjrContext* con, int hfieldi } #endif -#endif // MUJOCO_SRC_RENDER_RENDER_CONTEXT_H_ +#endif // MUJOCO_SRC_RENDER_CLASSIC_RENDER_CONTEXT_H_ diff --git a/src/render/render_gl2.c b/src/render/classic/render_gl2.c similarity index 99% rename from src/render/render_gl2.c rename to src/render/classic/render_gl2.c index 48806d81..cab7dd30 100644 --- a/src/render/render_gl2.c +++ b/src/render/classic/render_gl2.c @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "render/render_gl2.h" +#include "render/classic/render_gl2.h" #include #include @@ -21,7 +21,7 @@ #include #include #include "engine/engine_array_safety.h" -#include "render/glad/glad.h" +#include "render/classic/glad/glad.h" #define STRING_BUFSIZE 100 diff --git a/src/render/render_gl2.h b/src/render/classic/render_gl2.h similarity index 95% rename from src/render/render_gl2.h rename to src/render/classic/render_gl2.h index d9855c17..e3c43314 100644 --- a/src/render/render_gl2.h +++ b/src/render/classic/render_gl2.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_GL2_ -#define THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_GL2_ +#ifndef THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_GL2_ +#define THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_GL2_ #include #include @@ -81,4 +81,4 @@ MJAPI void mjr_figure(mjrRect viewport, mjvFigure* fig, const mjrContext* con); #if defined(__cplusplus) } #endif -#endif // THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_GL2_ +#endif // THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_GL2_ diff --git a/src/render/render_gl3.c b/src/render/classic/render_gl3.c similarity index 99% rename from src/render/render_gl3.c rename to src/render/classic/render_gl3.c index a13daa0e..30d246ff 100644 --- a/src/render/render_gl3.c +++ b/src/render/classic/render_gl3.c @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "render/render_gl3.h" +#include "render/classic/render_gl3.h" #include #include @@ -24,10 +24,10 @@ #include #include "engine/engine_sort.h" #include "engine/engine_vis_init.h" -#include "render/render_context.h" -#include "render/render_gl2.h" -#include "render/render_util.h" -#include "render/glad/glad.h" +#include "render/classic/render_context.h" +#include "render/classic/render_gl2.h" +#include "render/classic/render_util.h" +#include "render/classic/glad/glad.h" //----------------------------- low-level 3D rendering --------------------------------------------- diff --git a/src/render/render_gl3.h b/src/render/classic/render_gl3.h similarity index 84% rename from src/render/render_gl3.h rename to src/render/classic/render_gl3.h index 4986aa26..5a3de7bd 100644 --- a/src/render/render_gl3.h +++ b/src/render/classic/render_gl3.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_GL3_ -#define THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_GL3_ +#ifndef THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_GL3_ +#define THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_GL3_ #include #include @@ -35,4 +35,4 @@ MJAPI int mjr_getError(void); #if defined(__cplusplus) } #endif -#endif // THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_GL3_ +#endif // THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_GL3_ diff --git a/src/render/render_util.c b/src/render/classic/render_util.c similarity index 98% rename from src/render/render_util.c rename to src/render/classic/render_util.c index 11c010b7..98f319ed 100644 --- a/src/render/render_util.c +++ b/src/render/classic/render_util.c @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "render/render_util.h" +#include "render/classic/render_util.h" #include #include #include -#include "render/glad/glad.h" +#include "render/classic/glad/glad.h" //----------------------------- utility ------------------------------------------------------------ diff --git a/src/render/render_util.h b/src/render/classic/render_util.h similarity index 92% rename from src/render/render_util.h rename to src/render/classic/render_util.h index 709a53a4..2c2c6402 100644 --- a/src/render/render_util.h +++ b/src/render/classic/render_util.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_UTIL_ -#define THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_UTIL_ +#ifndef THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_UTIL_ +#define THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_UTIL_ #include #include @@ -70,4 +70,4 @@ MJAPI int mjr_findRect(int x, int y, int nrect, const mjrRect* rect); #if defined(__cplusplus) } #endif -#endif // THIRD_PARTY_MUJOCO_SRC_RENDER_RENDER_UTIL_ +#endif // THIRD_PARTY_MUJOCO_SRC_RENDER_CLASSIC_RENDER_UTIL_ diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 7996c610..ffc2fca2 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -21,7 +21,7 @@ #include #include #include "engine/engine_array_safety.h" -#include "render/glad/glad.h" +#include "render/classic/glad/glad.h" //------------------------------------ Default themes ----------------------------------------------