From 354f43020d956e7f02dcc81feab13e6fa0e98e10 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 9 Nov 2009 11:31:28 -0500 Subject: Make dmnsn_delete_scene() delete the scene's elements too. --- dimension/realize.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'dimension/realize.c') diff --git a/dimension/realize.c b/dimension/realize.c index f9f5532..b5c4225 100644 --- a/dimension/realize.c +++ b/dimension/realize.c @@ -172,7 +172,7 @@ dmnsn_realize(const dmnsn_array *astree) /* Allocate a canvas */ scene->canvas = dmnsn_new_canvas(768, 480); if (!scene->canvas) { - dmnsn_delete_realized_scene(scene); + dmnsn_delete_scene(scene); return NULL; } @@ -198,7 +198,7 @@ dmnsn_realize(const dmnsn_array *astree) /* Create a perspective camera */ scene->camera = dmnsn_new_perspective_camera(); if (!scene->camera) { - dmnsn_delete_realized_scene(scene); + dmnsn_delete_scene(scene); return NULL; } dmnsn_set_perspective_camera_trans(scene->camera, trans); @@ -228,26 +228,10 @@ dmnsn_realize(const dmnsn_array *astree) default: fprintf(stderr, "Unrecognised syntax element '%s'.\n", dmnsn_astnode_string(astnode.type)); - dmnsn_delete_realized_scene(scene); + dmnsn_delete_scene(scene); return NULL; } } return scene; } - -void -dmnsn_delete_realized_scene(dmnsn_scene *scene) -{ - dmnsn_object *object; - unsigned int i; - - for (i = 0; i < dmnsn_array_size(scene->objects); ++i) { - dmnsn_array_get(scene->objects, i, &object); - dmnsn_delete_object(object); - } - - dmnsn_delete_camera(scene->camera); - dmnsn_delete_canvas(scene->canvas); - dmnsn_delete_scene(scene); -} -- cgit v1.2.3