[ruamoko] Add wrappers for the existing scene functions

I've run into a bit of an issue with transform management (really, just
need to make them owned by the scene, but that means creating a scene
for quake and quakeworld).
This commit is contained in:
Bill Currie 2022-02-14 16:43:10 +09:00
parent f6ac614e09
commit afbca54faf
4 changed files with 209 additions and 1 deletions

View file

@ -62,5 +62,6 @@ struct plitem_s *Plist_GetItem (struct progs_s *pr, int handle);
void RUA_Input_Init (struct progs_s *pr, int secure);
void RUA_Mersenne_Init (struct progs_s *pr, int secure);
void RUA_Scene_Init (struct progs_s *pr, int secure);
#endif//__rua_internal_h

View file

@ -37,4 +37,5 @@ libs_ruamoko_libQFruamoko_client_la_DEPENDENCIES= \
libs_ruamoko_libQFruamoko_client_la_SOURCES= \
libs/ruamoko/rua_game_init.c \
libs/ruamoko/rua_input.c \
libs/ruamoko/rua_mersenne.c
libs/ruamoko/rua_mersenne.c \
libs/ruamoko/rua_scene.c

View file

@ -36,6 +36,7 @@
static void (*init_funcs[])(progs_t *, int) = {
RUA_Input_Init,
RUA_Mersenne_Init,
RUA_Scene_Init,
};
VISIBLE void

205
libs/ruamoko/rua_scene.c Normal file
View file

@ -0,0 +1,205 @@
/*
bi_scene.c
Ruamoko scene builtins
Copyright (C) 2022 Bill Currie <bill@taniwha.org>
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
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdlib.h>
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include "QF/cmem.h"
#include "QF/hash.h"
#include "QF/progs.h"
#include "QF/render.h"
#include "QF/scene/scene.h"
#include "QF/scene/transform.h"
#include "rua_internal.h"
typedef struct rua_scene_s {
struct rua_scene_s *next;
struct rua_scene_s **prev;
scene_t *scene;
} rua_scene_t;
typedef struct scene_resources_s {
progs_t *pr;
PR_RESMAP (rua_scene_t) scene_map;
rua_scene_t *scenes;
} scene_resources_t;
static rua_scene_t *
rua_scene_new (scene_resources_t *res)
{
return PR_RESNEW (res->scene_map);
}
static void
rua_scene_free (scene_resources_t *res, rua_scene_t *scene)
{
if (scene->next) {
scene->next->prev = scene->prev;
}
*scene->prev = scene->next;
scene->prev = 0;
PR_RESFREE (res->scene_map, scene);
}
static rua_scene_t *
rua__scene_get (scene_resources_t *res, int id, const char *name)
{
rua_scene_t *scene = PR_RESGET (res->scene_map, id);
// scene->prev will be null if the handle is unallocated
if (!scene || !scene->prev) {
PR_RunError (res->pr, "invalid scene passed to %s", name + 3);
}
return scene;
}
#define rua_scene_get(res, id) rua__scene_get(res, id, __FUNCTION__)
static entity_t *
rua__entity_get (progs_t *pr, rua_scene_t *scene, int id, const char *name)
{
entity_t *ent = Scene_GetEntity (scene->scene, id);
if (!ent) {
PR_RunError (pr, "invalid entity passed to %s", name + 3);
}
return ent;
}
#define rua_entity_get(pr, scene, id) rua__entity_get(pr, scene, id, __FUNCTION__)
static int
rua_scene_index (scene_resources_t *res, rua_scene_t *scene)
{
return PR_RESINDEX (res->scene_map, scene);
}
static void
bi_Scene_NewScene (progs_t *pr, void *_res)
{
scene_resources_t *res = _res;
rua_scene_t *scene = rua_scene_new (res);
scene->scene = Scene_NewScene ();
scene->next = res->scenes;
if (res->scenes) {
res->scenes->prev = &scene->next;
}
scene->prev = &res->scenes;
res->scenes = scene;
R_INT (pr) = rua_scene_index (res, scene);
}
static void
rua_delete_scene (scene_resources_t *res, rua_scene_t *scene)
{
Scene_DeleteScene (scene->scene);
rua_scene_free (res, scene);
}
static void
bi_Scene_DeleteScene (progs_t *pr, void *_res)
{
scene_resources_t *res = _res;
rua_scene_t *scene = rua_scene_get (res, P_INT (pr, 0));
rua_delete_scene (res, scene);
}
static void
bi_Scene_CreateEntity (progs_t *pr, void *_res)
{
scene_resources_t *res = _res;
rua_scene_t *scene = rua_scene_get (res, P_INT (pr, 0));
entity_t *ent = Scene_CreateEntity (scene->scene);
R_INT (pr) = ent->id;
}
static void
bi_Scene_DestroyEntity (progs_t *pr, void *_res)
{
scene_resources_t *res = _res;
rua_scene_t *scene = rua_scene_get (res, P_INT (pr, 0));
entity_t *ent = rua_entity_get (pr, scene, P_INT (pr, 1));
Scene_DestroyEntity (scene->scene, ent);
}
static void
bi_Entity_GetTransform (progs_t *pr, void *_res)
{
scene_resources_t *res = _res;
rua_scene_t *scene = rua_scene_get (res, P_INT (pr, 0));
entity_t *ent = rua_entity_get (pr, scene, P_INT (pr, 1));
R_INT (pr) = ent->transform->id;
}
#define p(type) PR_PARAM(type)
#define P(a, s) { .size = (s), .alignment = BITOP_LOG2 (a), }
#define bi(x,np,params...) {#x, bi_##x, -1, np, {params}}
static builtin_t builtins[] = {
bi(Scene_NewScene, 0),
bi(Scene_DeleteScene, 1, p(ptr)),
bi(Scene_CreateEntity, 1, p(ptr)),
bi(Scene_DestroyEntity, 2, p(ptr), p(ptr)),
bi(Entity_GetTransform, 2, p(ptr), p(ptr)),
{0}
};
static void
bi_scene_clear (progs_t *pr, void *_res)
{
scene_resources_t *res = _res;
while (res->scenes) {
rua_delete_scene (res, res->scenes);
}
}
void
RUA_Scene_Init (progs_t *pr, int secure)
{
scene_resources_t *res = calloc (sizeof (scene_resources_t), 1);
res->pr = pr;
PR_Resources_Register (pr, "scene", res, bi_scene_clear);
PR_RegisterBuiltins (pr, builtins, res);
}