commit 98ccb53927037e74b1ddbc1dec96409453ff0432
parent 3b3f5c46c57b83c7b571ca122c1493e1c4b743b1
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Tue, 11 Oct 2016 15:10:33 +0200
Remove the ssol_instance_set_target_mask function
Diffstat:
11 files changed, 1 insertion(+), 42 deletions(-)
diff --git a/src/ssol.h b/src/ssol.h
@@ -491,12 +491,6 @@ ssol_instance_set_receiver
const int mask); /* Combination of ssol_face_flags */
SSOL_API res_T
-ssol_instance_set_target_mask
- (struct ssol_instance* instance,
- const uint32_t front_mask,
- const uint32_t back_mask);
-
-SSOL_API res_T
ssol_instance_dont_sample
(struct ssol_instance* instance,
const int dont_sample);
diff --git a/src/ssol_instance.c b/src/ssol_instance.c
@@ -66,8 +66,7 @@ ssol_object_instantiate
dev = object->dev;
ASSERT(dev && dev->allocator);
- instance = (struct ssol_instance*)MEM_CALLOC
- (dev->allocator, 1, sizeof(struct ssol_instance));
+ instance = MEM_CALLOC(dev->allocator, 1, sizeof(struct ssol_instance));
if(!instance) {
res = RES_MEM_ERR;
goto error;
@@ -78,7 +77,6 @@ ssol_object_instantiate
SSOL(object_ref_get(object));
instance->dev = dev;
instance->object = object;
- instance->target_front_mask = instance->target_back_mask = 0;
d33_set_identity(instance->transform);
d3_splat(instance->transform + 9, 0);
@@ -161,20 +159,6 @@ ssol_instance_set_receiver(struct ssol_instance* instance, const int mask)
}
res_T
-ssol_instance_set_target_mask
- (struct ssol_instance* instance,
- const uint32_t front_mask,
- const uint32_t back_mask)
-{
- if(!instance)
- return RES_BAD_ARG;
-
- instance->target_front_mask = front_mask;
- instance->target_back_mask = back_mask;
- return RES_OK;
-}
-
-res_T
ssol_instance_dont_sample
(struct ssol_instance* instance,
const int dont_sample)
diff --git a/src/ssol_instance_c.h b/src/ssol_instance_c.h
@@ -25,7 +25,6 @@ struct ssol_instance {
struct s3d_shape* shape_rt; /* Instantiated Star-3D shape to ray-trace */
struct s3d_shape* shape_samp; /* Instantiated Star-3D shape to sample */
double transform[12]; /* Column major 4x3 affine transformation */
- uint32_t target_front_mask, target_back_mask; /* FIXME remove this? */
int receiver_mask; /* Combination of ssol_face_flag */
int dont_sample;
diff --git a/src/test_ssol_instance.c b/src/test_ssol_instance.c
@@ -75,11 +75,6 @@ main(int argc, char** argv)
CHECK(ssol_instance_set_receiver(NULL, 0), RES_BAD_ARG);
CHECK(ssol_instance_set_receiver(instance, 0), RES_OK);
#undef SET_RECEIVER
-
- CHECK(ssol_instance_set_target_mask(NULL, 1, 1), RES_BAD_ARG);
- CHECK(ssol_instance_set_target_mask(instance, 0, 1), RES_OK);
- CHECK(ssol_instance_set_target_mask(instance, 0x10, 0xF0), RES_OK);
-
CHECK(ssol_instance_dont_sample(NULL, 1), RES_BAD_ARG);
CHECK(ssol_instance_dont_sample(instance, 1), RES_OK);
CHECK(ssol_instance_dont_sample(instance, 0), RES_OK);
diff --git a/src/test_ssol_solver1.c b/src/test_ssol_solver1.c
@@ -131,13 +131,11 @@ main(int argc, char** argv)
CHECK(ssol_object_add_shaded_shape(m_object, square, m_mtl, m_mtl), RES_OK);
CHECK(ssol_object_instantiate(m_object, &heliostat), RES_OK);
CHECK(ssol_instance_set_receiver(heliostat, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(heliostat, 0x1, 0), RES_OK);
CHECK(ssol_scene_attach_instance(scene, heliostat), RES_OK);
CHECK(ssol_object_instantiate(m_object, &secondary), RES_OK);
CHECK(ssol_instance_set_receiver(secondary, SSOL_FRONT), RES_OK);
CHECK(ssol_instance_set_transform(secondary, transform1), RES_OK);
- CHECK(ssol_instance_set_target_mask(secondary, 0x2, 0), RES_OK);
CHECK(ssol_scene_attach_instance(scene, secondary), RES_OK);
CHECK(ssol_object_create(dev, &t_object), RES_OK);
@@ -145,7 +143,6 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target), RES_OK);
CHECK(ssol_instance_set_transform(target, transform2), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x4, 0), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
CHECK(ssol_solve(scene, rng, 1, stdout, estimator), RES_OK); /* ready to solve! */
@@ -229,9 +226,6 @@ main(int argc, char** argv)
/* sample primary mirror only; variance is low */
CHECK(ssol_instance_dont_sample(target, 1), RES_OK);
CHECK(ssol_instance_dont_sample(secondary, 1), RES_OK);
- CHECK(ssol_instance_set_target_mask(heliostat, 0, 0), RES_OK);
- CHECK(ssol_instance_set_target_mask(secondary, 0, 0), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x1, 0), RES_OK);
NCHECK(tmp = tmpfile(), 0);
CHECK(ssol_estimator_clear(estimator), RES_OK);
diff --git a/src/test_ssol_solver2.c b/src/test_ssol_solver2.c
@@ -177,7 +177,6 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target), RES_OK);
CHECK(ssol_instance_set_transform(target, transform2), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
diff --git a/src/test_ssol_solver2b.c b/src/test_ssol_solver2b.c
@@ -182,7 +182,6 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target), RES_OK);
CHECK(ssol_instance_set_transform(target, transform2), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
diff --git a/src/test_ssol_solver3.c b/src/test_ssol_solver3.c
@@ -136,7 +136,6 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target), RES_OK);
CHECK(ssol_instance_set_transform(target, transform), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
diff --git a/src/test_ssol_solver3N.c b/src/test_ssol_solver3N.c
@@ -201,7 +201,6 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target), RES_OK);
CHECK(ssol_instance_set_transform(target, transform), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
diff --git a/src/test_ssol_solver4.c b/src/test_ssol_solver4.c
@@ -137,13 +137,11 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target1), RES_OK);
CHECK(ssol_instance_set_transform(target1, transform), RES_OK);
CHECK(ssol_instance_set_receiver(target1, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target1, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target1, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target1), RES_OK);
CHECK(ssol_object_instantiate(t_object, &target2), RES_OK);
CHECK(ssol_instance_set_transform(target2, transform), RES_OK);
CHECK(ssol_instance_set_receiver(target2, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target2, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target2, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target2), RES_OK);
diff --git a/src/test_ssol_solver5.c b/src/test_ssol_solver5.c
@@ -136,7 +136,6 @@ main(int argc, char** argv)
CHECK(ssol_object_instantiate(t_object, &target), RES_OK);
CHECK(ssol_instance_set_transform(target, transform), RES_OK);
CHECK(ssol_instance_set_receiver(target, SSOL_FRONT), RES_OK);
- CHECK(ssol_instance_set_target_mask(target, 0x1, 0), RES_OK);
CHECK(ssol_instance_dont_sample(target, 1), RES_OK);
CHECK(ssol_scene_attach_instance(scene, target), RES_OK);
