mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-12-01 00:21:50 +00:00
20c861027e
This fixes the segfault due to the world entity not actually existing, without adding a world entity. It takes advantage of the ECS in that the edge renderer needs only the world matrix, brush model pointer, and the animation frame number (which is just 0/1 for brush models), thus the inherent SOA of ECS helps out, though benchmarking is needed to see if it made any real difference. With this, all 4 renderers are working again.
83 lines
2 KiB
C
83 lines
2 KiB
C
/*
|
|
scene.h
|
|
|
|
Entity management
|
|
|
|
Copyright (C) 2021 Bill Currie <bill@taniwha.org>
|
|
|
|
Author: Bill Currie <bill@taniwha.org>
|
|
Date: 2021/02/26
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License
|
|
as published by the Free Software Foundation; either version 2
|
|
of the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to:
|
|
|
|
Free Software Foundation, Inc.
|
|
59 Temple Place - Suite 330
|
|
Boston, MA 02111-1307, USA
|
|
|
|
*/
|
|
|
|
#ifndef __QF_scene_scene_h
|
|
#define __QF_scene_scene_h
|
|
|
|
#include "QF/darray.h"
|
|
|
|
#include "QF/scene/types.h"
|
|
|
|
/** \defgroup scene Scene management
|
|
\ingroup utils
|
|
*/
|
|
///@{
|
|
|
|
enum scene_components {
|
|
scene_href, //hierarchical transform
|
|
scene_animation,
|
|
scene_visibility,
|
|
scene_renderer,
|
|
scene_active,
|
|
scene_old_origin, //XXX FIXME XXX should not be here
|
|
|
|
//FIXME these should probably be private to the sw renderer (and in a
|
|
//group, which needs to be implemented), but need to sort out a good
|
|
//scheme for semi-dynamic components
|
|
scene_sw_matrix, // world transform matrix
|
|
scene_sw_frame, // animation frame
|
|
scene_sw_brush, // brush model data pointer
|
|
|
|
scene_num_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;
|
|
struct mleaf_s *viewleaf;
|
|
struct lightingdata_s *lights;
|
|
} scene_t;
|
|
|
|
scene_t *Scene_NewScene (void);
|
|
void Scene_DeleteScene (scene_t *scene);
|
|
struct entity_s Scene_CreateEntity (scene_t *scene);
|
|
void Scene_DestroyEntity (scene_t *scene, struct entity_s entity);
|
|
void Scene_FreeAllEntities (scene_t *scene);
|
|
|
|
|
|
///@}
|
|
|
|
#endif//__QF_scene_scene_h
|