[Scummvm-git-logs] scummvm master -> 4d21cfcc42ac480efc0cd378ea7b6a0e576a73b8

aquadran noreply at scummvm.org
Wed Aug 24 12:02:28 UTC 2022 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4d21cfcc42 WINTERMUTE: Rename files to match original


Commit: 4d21cfcc42ac480efc0cd378ea7b6a0e576a73b8
    https://github.com/scummvm/scummvm/commit/4d21cfcc42ac480efc0cd378ea7b6a0e576a73b8
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-08-24T14:02:18+02:00

Commit Message:
WINTERMUTE: Rename files to match original

Changed paths:
  A engines/wintermute/base/gfx/3dcamera.cpp
  A engines/wintermute/base/gfx/3dcamera.h
  A engines/wintermute/base/gfx/3dlight.cpp
  A engines/wintermute/base/gfx/3dlight.h
  A engines/wintermute/base/gfx/3dloader_3ds.cpp
  A engines/wintermute/base/gfx/3dloader_3ds.h
  A engines/wintermute/base/gfx/3dmesh.cpp
  A engines/wintermute/base/gfx/3dmesh.h
  A engines/wintermute/base/gfx/3dshadow_volume.cpp
  A engines/wintermute/base/gfx/3dshadow_volume.h
  A engines/wintermute/base/gfx/xactive_animation.cpp
  A engines/wintermute/base/gfx/xactive_animation.h
  A engines/wintermute/base/gfx/xanimation.cpp
  A engines/wintermute/base/gfx/xanimation.h
  A engines/wintermute/base/gfx/xanimation_channel.cpp
  A engines/wintermute/base/gfx/xanimation_channel.h
  A engines/wintermute/base/gfx/xanimation_set.cpp
  A engines/wintermute/base/gfx/xanimation_set.h
  A engines/wintermute/base/gfx/xframe_node.cpp
  A engines/wintermute/base/gfx/xframe_node.h
  A engines/wintermute/base/gfx/xloader.cpp
  A engines/wintermute/base/gfx/xloader.h
  A engines/wintermute/base/gfx/xmaterial.cpp
  A engines/wintermute/base/gfx/xmaterial.h
  A engines/wintermute/base/gfx/xmesh.cpp
  A engines/wintermute/base/gfx/xmesh.h
  A engines/wintermute/base/gfx/xmodel.cpp
  A engines/wintermute/base/gfx/xmodel.h
  R engines/wintermute/base/gfx/3ds/camera3d.cpp
  R engines/wintermute/base/gfx/3ds/camera3d.h
  R engines/wintermute/base/gfx/3ds/light3d.cpp
  R engines/wintermute/base/gfx/3ds/light3d.h
  R engines/wintermute/base/gfx/3ds/loader3ds.cpp
  R engines/wintermute/base/gfx/3ds/loader3ds.h
  R engines/wintermute/base/gfx/3ds/mesh3ds.cpp
  R engines/wintermute/base/gfx/3ds/mesh3ds.h
  R engines/wintermute/base/gfx/shadow_volume.cpp
  R engines/wintermute/base/gfx/shadow_volume.h
  R engines/wintermute/base/gfx/x/active_animation.cpp
  R engines/wintermute/base/gfx/x/active_animation.h
  R engines/wintermute/base/gfx/x/animation.cpp
  R engines/wintermute/base/gfx/x/animation.h
  R engines/wintermute/base/gfx/x/animation_channel.cpp
  R engines/wintermute/base/gfx/x/animation_channel.h
  R engines/wintermute/base/gfx/x/animation_set.cpp
  R engines/wintermute/base/gfx/x/animation_set.h
  R engines/wintermute/base/gfx/x/frame_node.cpp
  R engines/wintermute/base/gfx/x/frame_node.h
  R engines/wintermute/base/gfx/x/loader_x.cpp
  R engines/wintermute/base/gfx/x/loader_x.h
  R engines/wintermute/base/gfx/x/material.cpp
  R engines/wintermute/base/gfx/x/material.h
  R engines/wintermute/base/gfx/x/meshx.cpp
  R engines/wintermute/base/gfx/x/meshx.h
  R engines/wintermute/base/gfx/x/modelx.cpp
  R engines/wintermute/base/gfx/x/modelx.h
    engines/wintermute/ad/ad_actor_3dx.cpp
    engines/wintermute/ad/ad_attach_3dx.cpp
    engines/wintermute/ad/ad_block.cpp
    engines/wintermute/ad/ad_generic.cpp
    engines/wintermute/ad/ad_object_3d.cpp
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_scene_geometry.cpp
    engines/wintermute/ad/ad_walkplane.cpp
    engines/wintermute/ad/ad_waypoint_group3d.cpp
    engines/wintermute/base/base_object.cpp
    engines/wintermute/base/gfx/base_renderer.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
    engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
    engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
    engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
    engines/wintermute/base/gfx/opengl/meshx_opengl.h
    engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
    engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
    engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
    engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
    engines/wintermute/base/saveload.cpp
    engines/wintermute/module.mk
    engines/wintermute/persistent.cpp


diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index 1f9c632b461..eb97e6b9b9b 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -45,9 +45,9 @@
 #include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/base/particles/part_emitter.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
diff --git a/engines/wintermute/ad/ad_attach_3dx.cpp b/engines/wintermute/ad/ad_attach_3dx.cpp
index 4f848494087..c6442e7de81 100644
--- a/engines/wintermute/ad/ad_attach_3dx.cpp
+++ b/engines/wintermute/ad/ad_attach_3dx.cpp
@@ -28,9 +28,9 @@
 #include "engines/wintermute/ad/ad_attach_3dx.h"
 #include "engines/wintermute/base/base_active_rect.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
diff --git a/engines/wintermute/ad/ad_block.cpp b/engines/wintermute/ad/ad_block.cpp
index 03922b16254..b92d93bdab4 100644
--- a/engines/wintermute/ad/ad_block.cpp
+++ b/engines/wintermute/ad/ad_block.cpp
@@ -27,7 +27,7 @@
 
 #include "engines/wintermute/ad/ad_block.h"
 #include "engines/wintermute/base/base_persistence_manager.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_generic.cpp b/engines/wintermute/ad/ad_generic.cpp
index 0e93a2d0311..1421f5e3786 100644
--- a/engines/wintermute/ad/ad_generic.cpp
+++ b/engines/wintermute/ad/ad_generic.cpp
@@ -27,7 +27,7 @@
 
 #include "engines/wintermute/ad/ad_generic.h"
 #include "engines/wintermute/base/base_persistence_manager.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
index ce2c6a4ee1f..5c1ce18ba0b 100644
--- a/engines/wintermute/ad/ad_object_3d.cpp
+++ b/engines/wintermute/ad/ad_object_3d.cpp
@@ -30,9 +30,9 @@
 #include "engines/wintermute/ad/ad_scene.h"
 #include "engines/wintermute/ad/ad_scene_geometry.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
-#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script_value.h"
 #include "engines/wintermute/dcgf.h"
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 90019e38640..b096c980313 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -64,8 +64,8 @@
 #include "engines/wintermute/ad/ad_actor_3dx.h"
 #include "engines/wintermute/ad/ad_scene_geometry.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/3ds/camera3d.h"
-#include "engines/wintermute/base/gfx/3ds/light3d.h"
+#include "engines/wintermute/base/gfx/3dcamera.h"
+#include "engines/wintermute/base/gfx/3dlight.h"
 #endif
 
 namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index a1b18d73bc7..92f45ff7e8e 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -44,10 +44,10 @@
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/3ds/camera3d.h"
-#include "engines/wintermute/base/gfx/3ds/light3d.h"
-#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dcamera.h"
+#include "engines/wintermute/base/gfx/3dlight.h"
+#include "engines/wintermute/base/gfx/3dloader_3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 #include "engines/wintermute/math/math_util.h"
 #include "engines/wintermute/system/sys_class_registry.h"
 #include "engines/wintermute/wintermute.h"
diff --git a/engines/wintermute/ad/ad_walkplane.cpp b/engines/wintermute/ad/ad_walkplane.cpp
index 84db01314d2..513de990c6c 100644
--- a/engines/wintermute/ad/ad_walkplane.cpp
+++ b/engines/wintermute/ad/ad_walkplane.cpp
@@ -27,7 +27,7 @@
 
 #include "engines/wintermute/ad/ad_walkplane.h"
 #include "engines/wintermute/base/base_persistence_manager.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/ad/ad_waypoint_group3d.cpp b/engines/wintermute/ad/ad_waypoint_group3d.cpp
index a509c96b0ad..4688a903148 100644
--- a/engines/wintermute/ad/ad_waypoint_group3d.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group3d.cpp
@@ -28,7 +28,7 @@
 #include "common/util.h"
 
 #include "engines/wintermute/ad/ad_waypoint_group3d.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/base_object.cpp b/engines/wintermute/base/base_object.cpp
index aa6aa3234ce..0cbab94ffc8 100644
--- a/engines/wintermute/base/base_object.cpp
+++ b/engines/wintermute/base/base_object.cpp
@@ -40,7 +40,7 @@
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
 #include "engines/wintermute/base/gfx/base_renderer3d.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/wintermute.h"
 #endif
 
diff --git a/engines/wintermute/base/gfx/3ds/camera3d.cpp b/engines/wintermute/base/gfx/3dcamera.cpp
similarity index 97%
rename from engines/wintermute/base/gfx/3ds/camera3d.cpp
rename to engines/wintermute/base/gfx/3dcamera.cpp
index e4cdd971f49..64bea5c5263 100644
--- a/engines/wintermute/base/gfx/3ds/camera3d.cpp
+++ b/engines/wintermute/base/gfx/3dcamera.cpp
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "engines/wintermute/base/gfx/3ds/camera3d.h"
-#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
+#include "engines/wintermute/base/gfx/3dcamera.h"
+#include "engines/wintermute/base/gfx/3dloader_3ds.h"
 #include "engines/wintermute/math/math_util.h"
 
 #include "math/angle.h"
diff --git a/engines/wintermute/base/gfx/3ds/camera3d.h b/engines/wintermute/base/gfx/3dcamera.h
similarity index 100%
rename from engines/wintermute/base/gfx/3ds/camera3d.h
rename to engines/wintermute/base/gfx/3dcamera.h
diff --git a/engines/wintermute/base/gfx/3ds/light3d.cpp b/engines/wintermute/base/gfx/3dlight.cpp
similarity index 97%
rename from engines/wintermute/base/gfx/3ds/light3d.cpp
rename to engines/wintermute/base/gfx/3dlight.cpp
index 945fdb842fb..6d84810a148 100644
--- a/engines/wintermute/base/gfx/3ds/light3d.cpp
+++ b/engines/wintermute/base/gfx/3dlight.cpp
@@ -27,8 +27,8 @@
 
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/3ds/light3d.h"
-#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
+#include "engines/wintermute/base/gfx/3dlight.h"
+#include "engines/wintermute/base/gfx/3dloader_3ds.h"
 #include "engines/wintermute/math/math_util.h"
 #include "engines/wintermute/wintypes.h"
 
diff --git a/engines/wintermute/base/gfx/3ds/light3d.h b/engines/wintermute/base/gfx/3dlight.h
similarity index 96%
rename from engines/wintermute/base/gfx/3ds/light3d.h
rename to engines/wintermute/base/gfx/3dlight.h
index caf4c8d9478..49040b1b3bb 100644
--- a/engines/wintermute/base/gfx/3ds/light3d.h
+++ b/engines/wintermute/base/gfx/3dlight.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_LIGHT3D_H
-#define WINTERMUTE_LIGHT3D_H
+#ifndef WINTERMUTE_3D_LIGHT_H
+#define WINTERMUTE_3D_LIGHT_H
 
 #include "common/memstream.h"
 
diff --git a/engines/wintermute/base/gfx/3ds/loader3ds.cpp b/engines/wintermute/base/gfx/3dloader_3ds.cpp
similarity index 93%
rename from engines/wintermute/base/gfx/3ds/loader3ds.cpp
rename to engines/wintermute/base/gfx/3dloader_3ds.cpp
index 35e3df67527..8771e0d14eb 100644
--- a/engines/wintermute/base/gfx/3ds/loader3ds.cpp
+++ b/engines/wintermute/base/gfx/3dloader_3ds.cpp
@@ -24,10 +24,10 @@
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/base_renderer3d.h"
-#include "engines/wintermute/base/gfx/3ds/camera3d.h"
-#include "engines/wintermute/base/gfx/3ds/light3d.h"
-#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dcamera.h"
+#include "engines/wintermute/base/gfx/3dlight.h"
+#include "engines/wintermute/base/gfx/3dloader_3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/gfx/3ds/loader3ds.h b/engines/wintermute/base/gfx/3dloader_3ds.h
similarity index 96%
rename from engines/wintermute/base/gfx/3ds/loader3ds.h
rename to engines/wintermute/base/gfx/3dloader_3ds.h
index fa7b4c27d50..519252abe8a 100644
--- a/engines/wintermute/base/gfx/3ds/loader3ds.h
+++ b/engines/wintermute/base/gfx/3dloader_3ds.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef WINTERMUTE_LOADER3DS_H
-#define WINTERMUTE_LOADER3DS_H
+#ifndef WINTERMUTE_3D_LOADER_3DS_H
+#define WINTERMUTE_3D_LOADER_3DS_H
 
 #include "engines/wintermute/coll_templ.h"
 
diff --git a/engines/wintermute/base/gfx/3ds/mesh3ds.cpp b/engines/wintermute/base/gfx/3dmesh.cpp
similarity index 96%
rename from engines/wintermute/base/gfx/3ds/mesh3ds.cpp
rename to engines/wintermute/base/gfx/3dmesh.cpp
index ad06b057d80..8050603cdf4 100644
--- a/engines/wintermute/base/gfx/3ds/mesh3ds.cpp
+++ b/engines/wintermute/base/gfx/3dmesh.cpp
@@ -21,8 +21,8 @@
 
 #include "common/file.h"
 
-#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dloader_3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/gfx/3ds/mesh3ds.h b/engines/wintermute/base/gfx/3dmesh.h
similarity index 96%
rename from engines/wintermute/base/gfx/3ds/mesh3ds.h
rename to engines/wintermute/base/gfx/3dmesh.h
index eddd43456a7..5f07daf92d1 100644
--- a/engines/wintermute/base/gfx/3ds/mesh3ds.h
+++ b/engines/wintermute/base/gfx/3dmesh.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef WINTERMUTE_MESH_3DS_H
-#define WINTERMUTE_MESH_3DS_H
+#ifndef WINTERMUTE_3D_MESH_H
+#define WINTERMUTE_3D_MESH_H
 
 #include "common/memstream.h"
 
diff --git a/engines/wintermute/base/gfx/shadow_volume.cpp b/engines/wintermute/base/gfx/3dshadow_volume.cpp
similarity index 97%
rename from engines/wintermute/base/gfx/shadow_volume.cpp
rename to engines/wintermute/base/gfx/3dshadow_volume.cpp
index fcd4e2178e5..4dd252ee066 100644
--- a/engines/wintermute/base/gfx/shadow_volume.cpp
+++ b/engines/wintermute/base/gfx/3dshadow_volume.cpp
@@ -27,7 +27,7 @@
 
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
 #include "engines/wintermute/dcgf.h"
 #include "graphics/opengl/system_headers.h"
 
diff --git a/engines/wintermute/base/gfx/shadow_volume.h b/engines/wintermute/base/gfx/3dshadow_volume.h
similarity index 95%
rename from engines/wintermute/base/gfx/shadow_volume.h
rename to engines/wintermute/base/gfx/3dshadow_volume.h
index f88c19c6cd8..019d3333eef 100644
--- a/engines/wintermute/base/gfx/shadow_volume.h
+++ b/engines/wintermute/base/gfx/3dshadow_volume.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_SHADOW_VOLUME_H
-#define WINTERMUTE_SHADOW_VOLUME_H
+#ifndef WINTERMUTE_3D_SHADOW_VOLUME_H
+#define WINTERMUTE_3D_SHADOW_VOLUME_H
 
 #include "engines/wintermute//base/base.h"
 #include "engines/wintermute/coll_templ.h"
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 6982ea11d2f..ea5fea033f4 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -36,7 +36,7 @@
 #include "engines/wintermute/base/base_persistence_manager.h"
 
 #ifdef ENABLE_WME3D
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #endif
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index e262df69463..798aa3be354 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -24,8 +24,8 @@
 #include "engines/wintermute/ad/ad_walkplane.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/gfx/3ds/camera3d.h"
-#include "engines/wintermute/base/gfx/3ds/light3d.h"
+#include "engines/wintermute/base/gfx/3dcamera.h"
+#include "engines/wintermute/base/gfx/3dlight.h"
 
 #include "graphics/opengl/system_headers.h"
 
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index 34127d605c2..7ec2ef3052e 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -24,7 +24,7 @@
 #include "engines/wintermute/ad/ad_walkplane.h"
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/base_image.h"
-#include "engines/wintermute/base/gfx/3ds/camera3d.h"
+#include "engines/wintermute/base/gfx/3dcamera.h"
 
 #include "graphics/opengl/system_headers.h"
 
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
index 8e142adc3d6..f6e458016de 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
@@ -22,7 +22,7 @@
 #ifndef WINTERMUTE_MESH_OPENGL_H
 #define WINTERMUTE_MESH_OPENGL_H
 
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 #if defined(USE_OPENGL_GAME)
 
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
index 5191256719c..54f65815fee 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
@@ -22,7 +22,7 @@
 #ifndef WINTERMUTE_MESH_OPENGL_H
 #define WINTERMUTE_MESH_OPENGL_H
 
-#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3dmesh.h"
 
 #if defined(USE_OPENGL_SHADERS)
 
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
index f1efdc3bbd2..16dc7e8ece4 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
@@ -25,7 +25,7 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "engines/wintermute/base/gfx/x/material.h"
+#include "engines/wintermute/base/gfx/xmaterial.h"
 
 #include "graphics/opengl/system_headers.h"
 
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.h b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
index 05976668ce4..55aeb9d436a 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
@@ -28,7 +28,7 @@
 #ifndef WINTERMUTE_MESH_X_OPENGL_H
 #define WINTERMUTE_MESH_X_OPENGL_H
 
-#include "engines/wintermute/base/gfx/x/meshx.h"
+#include "engines/wintermute/base/gfx/xmesh.h"
 
 #if defined(USE_OPENGL_GAME)
 
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
index 9547c124dbc..616d0f227b9 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
@@ -25,7 +25,7 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "engines/wintermute/base/gfx/x/material.h"
+#include "engines/wintermute/base/gfx/xmaterial.h"
 
 #include "graphics/opengl/system_headers.h"
 
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
index 07a555e96a4..ce616c312e9 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
@@ -28,7 +28,7 @@
 #ifndef WINTERMUTE_MESH_X_OPENGL_SHADER_H
 #define WINTERMUTE_MESH_X_OPENGL_SHADER_H
 
-#include "engines/wintermute/base/gfx/x/meshx.h"
+#include "engines/wintermute/base/gfx/xmesh.h"
 
 #if defined(USE_OPENGL_SHADERS)
 
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
index ea8697875d7..88ffabbddad 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
@@ -28,7 +28,7 @@
 #ifndef WINTERMUTE_SHADOW_VOLUME_OPENGL_H
 #define WINTERMUTE_SHADOW_VOLUME_OPENGL_H
 
-#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
 
 #if defined(USE_OPENGL_GAME)
 
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
index c57cad442c5..90a0beb4f21 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
@@ -28,7 +28,7 @@
 #ifndef WINTERMUTE_SHADOW_VOLUME_OPENGL_SHADER_H
 #define WINTERMUTE_SHADOW_VOLUME_OPENGL_SHADER_H
 
-#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
 
 #include "graphics/opengl/system_headers.h"
 
diff --git a/engines/wintermute/base/gfx/x/active_animation.cpp b/engines/wintermute/base/gfx/xactive_animation.cpp
similarity index 97%
rename from engines/wintermute/base/gfx/x/active_animation.cpp
rename to engines/wintermute/base/gfx/xactive_animation.cpp
index 1d4f7b7e78f..19fc6f2372e 100644
--- a/engines/wintermute/base/gfx/x/active_animation.cpp
+++ b/engines/wintermute/base/gfx/xactive_animation.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/x/active_animation.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xactive_animation.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/dcgf.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/active_animation.h b/engines/wintermute/base/gfx/xactive_animation.h
similarity index 97%
rename from engines/wintermute/base/gfx/x/active_animation.h
rename to engines/wintermute/base/gfx/xactive_animation.h
index 67cc097fd9c..0742fba1f64 100644
--- a/engines/wintermute/base/gfx/x/active_animation.h
+++ b/engines/wintermute/base/gfx/xactive_animation.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_ACTIVE_ANIMATION_H
 
 #include "engines/wintermute/base/base.h"
-#include "engines/wintermute/base/gfx/x/animation_set.h"
+#include "engines/wintermute/base/gfx/xanimation_set.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/gfx/x/animation.cpp b/engines/wintermute/base/gfx/xanimation.cpp
similarity index 97%
rename from engines/wintermute/base/gfx/x/animation.cpp
rename to engines/wintermute/base/gfx/xanimation.cpp
index 5c0d4e4ec4f..2ad7b76858c 100644
--- a/engines/wintermute/base/gfx/x/animation.cpp
+++ b/engines/wintermute/base/gfx/xanimation.cpp
@@ -26,11 +26,11 @@
  */
 
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/x/animation.h"
-#include "engines/wintermute/base/gfx/x/animation_set.h"
-#include "engines/wintermute/base/gfx/x/frame_node.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
-#include "engines/wintermute/base/gfx/x/loader_x.h"
+#include "engines/wintermute/base/gfx/xanimation.h"
+#include "engines/wintermute/base/gfx/xanimation_set.h"
+#include "engines/wintermute/base/gfx/xframe_node.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
+#include "engines/wintermute/base/gfx/xloader.h"
 #include "engines/wintermute/dcgf.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/animation.h b/engines/wintermute/base/gfx/xanimation.h
similarity index 100%
rename from engines/wintermute/base/gfx/x/animation.h
rename to engines/wintermute/base/gfx/xanimation.h
diff --git a/engines/wintermute/base/gfx/x/animation_channel.cpp b/engines/wintermute/base/gfx/xanimation_channel.cpp
similarity index 98%
rename from engines/wintermute/base/gfx/x/animation_channel.cpp
rename to engines/wintermute/base/gfx/xanimation_channel.cpp
index 8617b6a1e14..6da72f398f7 100644
--- a/engines/wintermute/base/gfx/x/animation_channel.cpp
+++ b/engines/wintermute/base/gfx/xanimation_channel.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/x/animation_channel.h"
+#include "engines/wintermute/base/gfx/xanimation_channel.h"
 #include "engines/wintermute/dcgf.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/animation_channel.h b/engines/wintermute/base/gfx/xanimation_channel.h
similarity index 93%
rename from engines/wintermute/base/gfx/x/animation_channel.h
rename to engines/wintermute/base/gfx/xanimation_channel.h
index 0d526ab9e65..b698f5bb983 100644
--- a/engines/wintermute/base/gfx/x/animation_channel.h
+++ b/engines/wintermute/base/gfx/xanimation_channel.h
@@ -29,8 +29,8 @@
 #define WINTERMUTE_ANIMATION_CHANNEL_H
 
 #include "engines/wintermute/base/base.h"
-#include "engines/wintermute/base/gfx/x/active_animation.h"
-#include "engines/wintermute/base/gfx/x/animation_set.h"
+#include "engines/wintermute/base/gfx/xactive_animation.h"
+#include "engines/wintermute/base/gfx/xanimation_set.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/gfx/x/animation_set.cpp b/engines/wintermute/base/gfx/xanimation_set.cpp
similarity index 97%
rename from engines/wintermute/base/gfx/x/animation_set.cpp
rename to engines/wintermute/base/gfx/xanimation_set.cpp
index ef49916eb5d..19364d7bd64 100644
--- a/engines/wintermute/base/gfx/x/animation_set.cpp
+++ b/engines/wintermute/base/gfx/xanimation_set.cpp
@@ -26,9 +26,9 @@
  */
 
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/x/animation_set.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
-#include "engines/wintermute/base/gfx/x/loader_x.h"
+#include "engines/wintermute/base/gfx/xanimation_set.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
+#include "engines/wintermute/base/gfx/xloader.h"
 #include "engines/wintermute/dcgf.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/animation_set.h b/engines/wintermute/base/gfx/xanimation_set.h
similarity index 96%
rename from engines/wintermute/base/gfx/x/animation_set.h
rename to engines/wintermute/base/gfx/xanimation_set.h
index 16ec8b11950..d57f211341f 100644
--- a/engines/wintermute/base/gfx/x/animation_set.h
+++ b/engines/wintermute/base/gfx/xanimation_set.h
@@ -29,8 +29,8 @@
 #define WINTERMUTE_ANIMATION_SET_H
 
 #include "engines/wintermute/base/base_named_object.h"
-#include "engines/wintermute/base/gfx/x/animation.h"
-#include "engines/wintermute/base/gfx/x/frame_node.h"
+#include "engines/wintermute/base/gfx/xanimation.h"
+#include "engines/wintermute/base/gfx/xframe_node.h"
 #include "engines/wintermute/coll_templ.h"
 #include "engines/wintermute/persistent.h"
 
diff --git a/engines/wintermute/base/gfx/x/frame_node.cpp b/engines/wintermute/base/gfx/xframe_node.cpp
similarity index 98%
rename from engines/wintermute/base/gfx/x/frame_node.cpp
rename to engines/wintermute/base/gfx/xframe_node.cpp
index 0ba57e2eae5..516ad0e792a 100644
--- a/engines/wintermute/base/gfx/x/frame_node.cpp
+++ b/engines/wintermute/base/gfx/xframe_node.cpp
@@ -27,10 +27,10 @@
 
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/base_renderer3d.h"
-#include "engines/wintermute/base/gfx/x/material.h"
-#include "engines/wintermute/base/gfx/x/frame_node.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
-#include "engines/wintermute/base/gfx/x/loader_x.h"
+#include "engines/wintermute/base/gfx/xmaterial.h"
+#include "engines/wintermute/base/gfx/xframe_node.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
+#include "engines/wintermute/base/gfx/xloader.h"
 #include "engines/wintermute/dcgf.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/frame_node.h b/engines/wintermute/base/gfx/xframe_node.h
similarity index 96%
rename from engines/wintermute/base/gfx/x/frame_node.h
rename to engines/wintermute/base/gfx/xframe_node.h
index aac91763402..80ea4f41168 100644
--- a/engines/wintermute/base/gfx/x/frame_node.h
+++ b/engines/wintermute/base/gfx/xframe_node.h
@@ -29,8 +29,8 @@
 #define WINTERMUTE_FRAME_NODE_H
 
 #include "engines/wintermute/base/base_named_object.h"
-#include "engines/wintermute/base/gfx/x/meshx.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmesh.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/coll_templ.h"
 
 #include "math/matrix4.h"
diff --git a/engines/wintermute/base/gfx/x/loader_x.cpp b/engines/wintermute/base/gfx/xloader.cpp
similarity index 99%
rename from engines/wintermute/base/gfx/x/loader_x.cpp
rename to engines/wintermute/base/gfx/xloader.cpp
index 0db0aecc2ea..312dbdce549 100644
--- a/engines/wintermute/base/gfx/x/loader_x.cpp
+++ b/engines/wintermute/base/gfx/xloader.cpp
@@ -25,7 +25,7 @@
 #include "common/textconsole.h"
 #include "common/util.h"
 
-#include "engines/wintermute/base/gfx/x/loader_x.h"
+#include "engines/wintermute/base/gfx/xloader.h"
 
 namespace Wintermute {
 
diff --git a/engines/wintermute/base/gfx/x/loader_x.h b/engines/wintermute/base/gfx/xloader.h
similarity index 100%
rename from engines/wintermute/base/gfx/x/loader_x.h
rename to engines/wintermute/base/gfx/xloader.h
diff --git a/engines/wintermute/base/gfx/x/material.cpp b/engines/wintermute/base/gfx/xmaterial.cpp
similarity index 98%
rename from engines/wintermute/base/gfx/x/material.cpp
rename to engines/wintermute/base/gfx/xmaterial.cpp
index 17df7ce5717..f7e3ef25e48 100644
--- a/engines/wintermute/base/gfx/x/material.cpp
+++ b/engines/wintermute/base/gfx/xmaterial.cpp
@@ -29,8 +29,8 @@
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/gfx/x/material.h"
-#include "engines/wintermute/base/gfx/x/loader_x.h"
+#include "engines/wintermute/base/gfx/xmaterial.h"
+#include "engines/wintermute/base/gfx/xloader.h"
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/utils/path_util.h"
 #include "engines/wintermute/video/video_theora_player.h"
diff --git a/engines/wintermute/base/gfx/x/material.h b/engines/wintermute/base/gfx/xmaterial.h
similarity index 100%
rename from engines/wintermute/base/gfx/x/material.h
rename to engines/wintermute/base/gfx/xmaterial.h
diff --git a/engines/wintermute/base/gfx/x/meshx.cpp b/engines/wintermute/base/gfx/xmesh.cpp
similarity index 98%
rename from engines/wintermute/base/gfx/x/meshx.cpp
rename to engines/wintermute/base/gfx/xmesh.cpp
index 1be7aae029b..42d875fd18b 100644
--- a/engines/wintermute/base/gfx/x/meshx.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -25,12 +25,12 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "engines/wintermute/base/gfx/shadow_volume.h"
-#include "engines/wintermute/base/gfx/x/material.h"
-#include "engines/wintermute/base/gfx/x/meshx.h"
-#include "engines/wintermute/base/gfx/x/frame_node.h"
-#include "engines/wintermute/base/gfx/x/loader_x.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/3dshadow_volume.h"
+#include "engines/wintermute/base/gfx/xmaterial.h"
+#include "engines/wintermute/base/gfx/xmesh.h"
+#include "engines/wintermute/base/gfx/xframe_node.h"
+#include "engines/wintermute/base/gfx/xloader.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/math/math_util.h"
 
 namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/x/meshx.h b/engines/wintermute/base/gfx/xmesh.h
similarity index 98%
rename from engines/wintermute/base/gfx/x/meshx.h
rename to engines/wintermute/base/gfx/xmesh.h
index 111b803adc2..b9ffc628de8 100644
--- a/engines/wintermute/base/gfx/x/meshx.h
+++ b/engines/wintermute/base/gfx/xmesh.h
@@ -29,7 +29,7 @@
 #define WINTERMUTE_MESH_X_H
 
 #include "engines/wintermute/base/base_named_object.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #include "engines/wintermute/coll_templ.h"
 
 #include "math/matrix4.h"
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/xmodel.cpp
similarity index 98%
rename from engines/wintermute/base/gfx/x/modelx.cpp
rename to engines/wintermute/base/gfx/xmodel.cpp
index 77a3fb2fd1f..c91e75ffff4 100644
--- a/engines/wintermute/base/gfx/x/modelx.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -32,13 +32,13 @@
 #include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/x/active_animation.h"
-#include "engines/wintermute/base/gfx/x/animation_channel.h"
-#include "engines/wintermute/base/gfx/x/animation_set.h"
-#include "engines/wintermute/base/gfx/x/frame_node.h"
-#include "engines/wintermute/base/gfx/x/material.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
-#include "engines/wintermute/base/gfx/x/loader_x.h"
+#include "engines/wintermute/base/gfx/xactive_animation.h"
+#include "engines/wintermute/base/gfx/xanimation_channel.h"
+#include "engines/wintermute/base/gfx/xanimation_set.h"
+#include "engines/wintermute/base/gfx/xframe_node.h"
+#include "engines/wintermute/base/gfx/xmaterial.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
+#include "engines/wintermute/base/gfx/xloader.h"
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/utils/path_util.h"
 #include "engines/wintermute/utils/utils.h"
diff --git a/engines/wintermute/base/gfx/x/modelx.h b/engines/wintermute/base/gfx/xmodel.h
similarity index 100%
rename from engines/wintermute/base/gfx/x/modelx.h
rename to engines/wintermute/base/gfx/xmodel.h
diff --git a/engines/wintermute/base/saveload.cpp b/engines/wintermute/base/saveload.cpp
index 3fefac5c2b7..34f0d9f31e9 100644
--- a/engines/wintermute/base/saveload.cpp
+++ b/engines/wintermute/base/saveload.cpp
@@ -38,7 +38,7 @@
 #include "engines/wintermute/base/sound/base_sound.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #ifdef ENABLE_WME3D
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #endif
 
 #include "common/savefile.h"
diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
index bb8490c4f2b..8a930d19866 100644
--- a/engines/wintermute/module.mk
+++ b/engines/wintermute/module.mk
@@ -158,8 +158,21 @@ MODULE_OBJS += \
 	ad/ad_scene_geometry.o \
 	ad/ad_walkplane.o \
 	ad/ad_waypoint_group3d.o \
+	base/gfx/3dcamera.o \
+	base/gfx/3dlight.o \
+	base/gfx/3dloader_3ds.o \
+	base/gfx/3dmesh.o \
+	base/gfx/3dshadow_volume.o \
 	base/gfx/base_renderer3d.o \
-	base/gfx/shadow_volume.o \
+	base/gfx/xactive_animation.o \
+	base/gfx/xanimation.o \
+	base/gfx/xanimation_channel.o \
+	base/gfx/xanimation_set.o \
+	base/gfx/xframe_node.o \
+	base/gfx/xmaterial.o \
+	base/gfx/xmesh.o \
+	base/gfx/xmodel.o \
+	base/gfx/xloader.o \
 	base/gfx/opengl/base_surface_opengl3d.o \
 	base/gfx/opengl/base_render_opengl3d.o \
 	base/gfx/opengl/base_render_opengl3d_shader.o \
@@ -169,19 +182,6 @@ MODULE_OBJS += \
 	base/gfx/opengl/mesh3ds_opengl_shader.o \
 	base/gfx/opengl/shadow_volume_opengl.o \
 	base/gfx/opengl/shadow_volume_opengl_shader.o \
-	base/gfx/x/active_animation.o \
-	base/gfx/x/animation.o \
-	base/gfx/x/animation_channel.o \
-	base/gfx/x/animation_set.o \
-	base/gfx/x/frame_node.o \
-	base/gfx/x/material.o \
-	base/gfx/x/meshx.o \
-	base/gfx/x/modelx.o \
-	base/gfx/x/loader_x.o \
-	base/gfx/3ds/camera3d.o \
-	base/gfx/3ds/light3d.o \
-	base/gfx/3ds/loader3ds.o \
-	base/gfx/3ds/mesh3ds.o \
 	base/base_animation_transition_time.o
 endif
 
diff --git a/engines/wintermute/persistent.cpp b/engines/wintermute/persistent.cpp
index d3fe80e4a7c..5b4b5d54944 100644
--- a/engines/wintermute/persistent.cpp
+++ b/engines/wintermute/persistent.cpp
@@ -100,7 +100,7 @@
 #include "engines/wintermute/ad/ad_path3d.h"
 #include "engines/wintermute/ad/ad_path_point3d.h"
 #include "engines/wintermute/ad/ad_scene_geometry.h"
-#include "engines/wintermute/base/gfx/x/modelx.h"
+#include "engines/wintermute/base/gfx/xmodel.h"
 #endif
 
 // SystemClass adds these objects to the registry, thus they aren't as leaked as they look

More information about the Scummvm-git-logs mailing list