diff --git a/include/Makemodule.am b/include/Makemodule.am index dab0b609d..30d6f71e9 100644 --- a/include/Makemodule.am +++ b/include/Makemodule.am @@ -71,7 +71,6 @@ EXTRA_DIST += \ include/regex.h \ include/rua_internal.h \ include/skin_stencil.h \ - include/scn_internal.h \ include/snd_internal.h \ include/sv_console.h \ include/varrays.h \ diff --git a/include/QF/scene/scene.h b/include/QF/scene/scene.h index dd96576fc..3a1d281e0 100644 --- a/include/QF/scene/scene.h +++ b/include/QF/scene/scene.h @@ -62,9 +62,6 @@ enum scene_components { typedef struct scene_s { struct ecs_registry_s *reg; - struct scene_resources_s *const resources; - struct hierarchy_s *hierarchies; - struct model_s *worldmodel; int num_models; struct model_s **models; diff --git a/include/scn_internal.h b/include/scn_internal.h deleted file mode 100644 index 906bef517..000000000 --- a/include/scn_internal.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __scn_internal_h -#define __scn_internal_h - -typedef struct scene_resources_s { -} scene_resources_t; - -#endif//__scn_internal_h diff --git a/libs/scene/camera.c b/libs/scene/camera.c index 327bea646..3739305da 100644 --- a/libs/scene/camera.c +++ b/libs/scene/camera.c @@ -35,8 +35,6 @@ #include "QF/scene/scene.h" #include "QF/scene/transform.h" -#include "scn_internal.h" - void Camera_GetViewMatrix (const camera_t *camera, mat4f_t view) { diff --git a/libs/scene/entity.c b/libs/scene/entity.c index 92e5099d7..8d88ea8c1 100644 --- a/libs/scene/entity.c +++ b/libs/scene/entity.c @@ -35,8 +35,6 @@ #include "QF/scene/entity.h" #include "QF/scene/scene.h" -#include "scn_internal.h" - entqueue_t * EntQueue_New (int num_queues) { diff --git a/libs/scene/scene.c b/libs/scene/scene.c index 82e87bb96..6704e7e48 100644 --- a/libs/scene/scene.c +++ b/libs/scene/scene.c @@ -43,8 +43,6 @@ #include "QF/scene/scene.h" #include "QF/scene/transform.h" -#include "scn_internal.h" - static void create_active (void *_active) { @@ -215,9 +213,6 @@ Scene_NewScene (void) ECS_RegisterComponents (scene->reg, scene_components, scene_comp_count); ECS_CreateComponentPools (scene->reg); - scene_resources_t *res = calloc (1, sizeof (scene_resources_t)); - *(scene_resources_t **)&scene->resources = res; - scene->worldmodel = &empty_world; return scene; @@ -228,7 +223,6 @@ Scene_DeleteScene (scene_t *scene) { ECS_DelRegistry (scene->reg); - free (scene->resources); free (scene); } diff --git a/libs/scene/transform.c b/libs/scene/transform.c index 31ea16137..c9b532fab 100644 --- a/libs/scene/transform.c +++ b/libs/scene/transform.c @@ -40,8 +40,6 @@ #include "QF/scene/scene.h" #include "QF/scene/transform.h" -#include "scn_internal.h" - static void transform_mat4f_identity (void *_mat) {