YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish JerryScript Entity/Scene wiring; remove JSON serialize/deserialize

Browse Source 
Register Entity, the generic Component wrapper, and Scene as JerryScript
classes (modulelist.c ties them together, plus their .d.ts stubs), so
scenes/entities can be built from script going forward instead of the
JSON scene format.

With scripting now the intended authoring path, drop the JSON
serialize/deserialize machinery entirely: componentdefinition_t's
serialize/deserialize callbacks, every component's *Serialize/
*Deserialize function, entitySerialize/entityDeserialize,
sceneSerialize/sceneDeserialize, and the "prefabs/<name>.json"/
"scenes/<name>.json" asset fallback in entityPrefabResolveAndApply/
scenePrefabResolveAndApply (C-coded prefabs only now). physicsshape.c
and its test are removed outright since they only existed for this.
game.c's test scene now comes from the existing overworldSceneCreate()
C builder instead of loading the now-deleted assets/scenes/test.json.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Dominic Masters
2026-07-30 11:19:08 -05:00
parent 015d90519f
commit e61914bad4
53 changed files with 576 additions and 2081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/scene/test_scene.c
-78
View File
@@ -11,7 +11,6 @@
#include "scene/scene.h"
#include "entity/entitymanager.h"
#include "entity/component/display/entityposition.h"
#include "yyjson.h"
static void countingUpdateCallback(
entitymanager_t *mgr,
@@ -139,82 +138,6 @@ static void test_sceneUpdateOnlyRunsFixedUpdateOnNonDynamicFrames(void **state)
assert_int_equal(memoryGetAllocatedCount(), 0);
}
static void test_sceneSerializeDeserializeParentLink(void **state) {
sceneInit();
sceneid_t sceneA = sceneCreate();
entitymanager_t *mgrA = sceneGetEntities(sceneA);
entityid_t parent = entityManagerAdd(mgrA);
componentid_t parentPos = entityAddComponent(
mgrA, parent, COMPONENT_TYPE_POSITION
);
entitySetName(mgrA, parent, "root");
entityPositionSetLocalPosition(mgrA, parent, parentPos, (vec3){ 10, 0, 0 });
entityid_t child = entityManagerAdd(mgrA);
componentid_t childPos = entityAddComponent(
mgrA, child, COMPONENT_TYPE_POSITION
);
entityPositionSetLocalPosition(mgrA, child, childPos, (vec3){ 1, 0, 0 });
entityPositionSetParent(mgrA, child, childPos, parent, parentPos);
vec3 childWorldBefore;
entityPositionGetWorldPosition(mgrA, child, childPos, childWorldBefore);
assert_float_equal(childWorldBefore[0], 11.0f, 0.0001f);
yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
yyjson_mut_val *root = yyjson_mut_obj(doc);
yyjson_mut_doc_set_root(doc, root);
errorret_t ret = sceneSerialize(sceneA, doc, root);
assert_true(errorIsOk(ret));
size_t len = 0;
char_t *jsonStr = yyjson_mut_write(doc, 0, &len);
assert_non_null(jsonStr);
yyjson_mut_doc_free(doc);
yyjson_doc *readDoc = yyjson_read(jsonStr, len, 0);
free(jsonStr);
assert_non_null(readDoc);
sceneid_t sceneB = sceneCreate();
entitymanager_t *mgrB = sceneGetEntities(sceneB);
ret = sceneDeserialize(sceneB, yyjson_doc_get_root(readDoc));
yyjson_doc_free(readDoc);
assert_true(errorIsOk(ret));
entityid_t reloadedParent = entityFindByName(mgrB, "root");
assert_true(reloadedParent != ENTITY_ID_INVALID);
entityid_t reloadedChild = ENTITY_ID_INVALID;
for(entityid_t i = 0; i < ENTITY_COUNT_MAX; i++) {
if(!(mgrB->entities[i].state & ENTITY_STATE_ACTIVE)) continue;
if(i == reloadedParent) continue;
reloadedChild = i;
break;
}
assert_true(reloadedChild != ENTITY_ID_INVALID);
componentid_t reloadedChildPos = entityGetComponent(
mgrB, reloadedChild, COMPONENT_TYPE_POSITION
);
assert_true(reloadedChildPos != COMPONENT_ID_INVALID);
assert_int_equal(
entityPositionGetParent(mgrB, reloadedChild, reloadedChildPos),
reloadedParent
);
vec3 childWorldAfter;
entityPositionGetWorldPosition(
mgrB, reloadedChild, reloadedChildPos, childWorldAfter
);
assert_float_equal(childWorldAfter[0], childWorldBefore[0], 0.0001f);
sceneDispose();
assert_int_equal(memoryGetAllocatedCount(), 0);
}
static void test_sceneDestroyClearsActive(void **state) {
sceneInit();
@@ -235,7 +158,6 @@ int main(int argc, char **argv) {
cmocka_unit_test(test_sceneEntitiesAreIsolatedPerScene),
cmocka_unit_test(test_sceneFixedUpdateOnlyTicksActiveScene),
cmocka_unit_test(test_sceneUpdateOnlyRunsFixedUpdateOnNonDynamicFrames),
cmocka_unit_test(test_sceneSerializeDeserializeParentLink),
cmocka_unit_test(test_sceneDestroyClearsActive),
};