solstice-solver

commit d1e27aa0022742f73469f8323eadbe84a8cb7f55
parent 5bf6eec9f8449564ae491d8d8465afb1a8fbe2ad
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Mon,  3 Apr 2017 18:41:29 +0200

Remove dead code.

Diffstat:
M
src/ssol_object.c
 | 
2
--
M
src/ssol_object_c.h
 | 
1
-
M
src/ssol_shape.c
 | 
17
++++-------------
M
src/ssol_shape_c.h
 | 
1
-

4 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/ssol_object.c b/src/ssol_object.c
@@ -165,7 +165,6 @@ ssol_object_add_shaded_shape
   /* Setup the object shaded shape */
   object->scn_rt_area += shape->shape_rt_area;
   object->scn_samp_area += shape->shape_samp_area;
-  d3_add(object->n, object->n, shape->n);
   SSOL(shape_ref_get(shape));
   SSOL(material_ref_get(front));
   SSOL(material_ref_get(back));
@@ -216,7 +215,6 @@ ssol_object_clear(struct ssol_object* obj)
 
   obj->scn_rt_area = 0;
   obj->scn_samp_area = 0;
-  d3_splat(obj->n, 0);
 
   S3D(scene_clear(obj->scn_rt));
   S3D(scene_clear(obj->scn_samp));
diff --git a/src/ssol_object_c.h b/src/ssol_object_c.h
@@ -48,7 +48,6 @@ struct ssol_object {
   struct s3d_scene* scn_rt; /* RT scene to instantiate */
   struct s3d_scene* scn_samp; /* Sampling scene to instantiate */
   double scn_rt_area, scn_samp_area;
-  double n[3]; /* sum of normals */
 
   struct ssol_device* dev;
   ref_T ref;
diff --git a/src/ssol_shape.c b/src/ssol_shape.c
@@ -475,14 +475,12 @@ mesh_compute_area
    void (*get_indices)(const unsigned itri, unsigned ids[3], void* data),
    const unsigned nverts,
    void (*get_position)(const unsigned ivert, float position[3], void* data),
-   void* ctx,
-   double* normal)
+   void* ctx)
 {
   unsigned itri;
   double area = 0;
   (void)nverts;
 
-  if(normal) d3_splat(normal, 0);
   FOR_EACH(itri, 0, ntris) {
     float v0[3], v1[3], v2[3];
     double E0[3], E1[3], N[3];
@@ -504,9 +502,7 @@ mesh_compute_area
     d3_sub(E1, V2, V0);
 
     area += d3_len(d3_cross(N, E0, E1));
-    if(normal) d3_add(normal, normal, N);
   }
-  if (normal) d3_muld(normal, normal, 0.5);
   return area * 0.5;
 }
 
@@ -564,7 +560,7 @@ quadric_setup_s3d_shape_rt
 
   ASSERT(vdata.get);
   *rt_area = mesh_compute_area
-    (ntris, quadric_mesh_get_ids, nverts, vdata.get, &ctx, NULL);
+    (ntris, quadric_mesh_get_ids, nverts, vdata.get, &ctx);
   return RES_OK;
 }
 
@@ -602,7 +598,7 @@ quadric_setup_s3d_shape_samp
     (shape, ntris, quadric_mesh_get_ids, nverts, &vdata, 1, &ctx);
   if(res != RES_OK) return res;
   *samp_area = mesh_compute_area
-    (ntris, quadric_mesh_get_ids, nverts, quadric_mesh_plane_get_pos, &ctx, NULL);
+    (ntris, quadric_mesh_get_ids, nverts, quadric_mesh_plane_get_pos, &ctx);
   return RES_OK;
 }
 
@@ -1250,7 +1246,6 @@ ssol_punched_surface_setup
   struct darray_double coords;
   struct darray_size_t ids;
   size_t nslices;
-  double n;
   res_T res = RES_OK;
 
   darray_double_init(shape->dev->allocator, &coords);
@@ -1302,10 +1297,6 @@ ssol_punched_surface_setup
   res = quadric_setup_s3d_shape_samp
     (psurf->quadric, &coords, &ids, shape->shape_samp, &shape->shape_samp_area);
   if(res != RES_OK) goto error;
-  /* the normal to the quadric is known */
-  n = psurf->quadric->type == SSOL_QUADRIC_HYPERBOL
-    ? -shape->shape_samp_area : shape->shape_samp_area;
-  d3(shape->n, 0, 0, n);
 
 exit:
   darray_double_release(&coords);
@@ -1372,7 +1363,7 @@ ssol_mesh_setup
     (shape->shape_rt, ntris, get_indices, nverts, attrs, nattribs, data);
   if(res != RES_OK) goto error;
   shape->shape_rt_area =
-    mesh_compute_area(ntris, get_indices, nverts, get_position, data, shape->n);
+    mesh_compute_area(ntris, get_indices, nverts, get_position, data);
 
   /* The Star-3D shape to sample is the same of the one to ray-traced */
   res = s3d_mesh_copy(shape->shape_rt, shape->shape_samp);
diff --git a/src/ssol_shape_c.h b/src/ssol_shape_c.h
@@ -57,7 +57,6 @@ struct ssol_shape {
   union priv_quadric_data priv_quadric;
   struct ssol_quadric quadric;
   double shape_rt_area, shape_samp_area;
-  double n[3]; /* sum of normals */
 
   struct ssol_device* dev;
   ref_T ref;