commit 0665e1cfd154d306b9f480e2be14bc29e4171a3d
parent 250d986a5fa03e1732c41a7d94e3e6413e0f01fa
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Thu, 29 Sep 2016 16:55:45 +0200
Fix vocabulary
Remove references to "primary mirrors" to denote the place where
realisations start, because realisations can start on any instance,
regardless of their material.
Diffstat:
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/ssol_scene.c b/src/ssol_scene.c
@@ -411,7 +411,7 @@ hit_filter_function
}
/* Check if the hit surface is a receiver that registers hit data */
- /* impacts on receivers before primary mirros are not registered */
+ /* impacts on receivers before sampled surfaces are not registered */
if (!seg->sun_segment && !str_is_empty(receiver_name)) {
struct receiver_record candidate;
d3_set(candidate.dir, seg->dir);
diff --git a/src/ssol_scene_c.h b/src/ssol_scene_c.h
@@ -47,7 +47,7 @@ struct ssol_scene {
ref_T ref;
};
-/* Fill the Star-3D sampling scene with the Star-3D shape of the mirrors */
+/* Fill the Star-3D sampling scene with the Star-3D shape of the instances */
extern LOCAL_SYM res_T
scene_setup_s3d_sampling_scene
(struct ssol_scene* scn,
diff --git a/src/ssol_solver.c b/src/ssol_solver.c
@@ -451,7 +451,7 @@ release_realisation(struct realisation* rs)
* material is set to NULL and will be set later
*/
static void
-sample_point_on_primary_mirror(struct realisation* rs)
+sample_starting_point(struct realisation* rs)
{
struct s3d_attrib attrib;
struct ssol_shape* shape;
@@ -464,7 +464,7 @@ sample_point_on_primary_mirror(struct realisation* rs)
data = &rs->data;
ASSERT(data->rng && data->view_samp && data->scene);
start = &rs->start;
- /* sample a point on a primary mirror's carving */
+ /* sample a point on an instance's sampling surface */
r1 = ssp_rng_canonical_float(data->rng);
r2 = ssp_rng_canonical_float(data->rng);
r3 = ssp_rng_canonical_float(data->rng);
@@ -473,7 +473,7 @@ sample_point_on_primary_mirror(struct realisation* rs)
ASSERT(attrib.type == S3D_FLOAT3);
d3_set_f3(start->pos, attrib.value);
- /* find the solstice shape and project the sampled point on the mirror */
+ /* find the sampled shape and project the sampled point on the actual geometry */
start->instance = *htable_instance_find
(&data->scene->instances_samp, &sampl_prim.inst_id);
start->sampl_primitive = sampl_prim;
@@ -776,7 +776,7 @@ ssol_solve
CHECK(fgetpos(output, &real_start), 0);
do {
reset_realisation(r, &rs);
- sample_point_on_primary_mirror(&rs);
+ sample_starting_point(&rs);
sample_input_sundir(&rs);
sample_wavelength(&rs);