solstice-solver

commit 27e5249bff9224d5c7dac777aa9972b1a7aafc0f
parent f271feacccc91ed0903993b67e9c976e5d31b39e
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 28 Jun 2016 16:46:11 +0200

Refactor the material API

Diffstat:
M
src/ssol.h
 | 
26
++++++++++++++++++++------
M
src/ssol_shape.c
 | 
9
++++-----

2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/ssol.h b/src/ssol.h
@@ -170,9 +170,23 @@ struct ssol_punched_surface {
   size_t nb_carvings;
 };
 
+
+typedef void
+(*ssol_shader_getter_T)
+  (struct ssol_device* dev,
+   const double wavelength, /* In nanometer */
+   const double P[3], /* World space position */
+   const double Ng[3], /* World space geometry normal */
+   const double uv[2], /* Parametric coordinates */
+   const double wo[3], /* Incident direction */
+   double* val); /* Returned value */
+
 /* Material descriptors */
-struct ssol_miror_desc {
-  char dummy; /* TODO */
+struct ssol_mirror_shader {
+  ssol_shader_getter_T shading_normal;
+  ssol_shader_getter_T reflectivity;
+  ssol_shader_getter_T diffuse_specular_ratio;
+  ssol_shader_getter_T roughness;
 };
 
 /*
@@ -327,9 +341,9 @@ ssol_mesh_setup
  * (e.g.: refractive index) properties of a geometry.
  ******************************************************************************/
 SSOL_API res_T
-ssol_material_create
+ssol_material_create_mirror
   (struct ssol_device* dev,
-   struct ssol_material* mtl);
+   struct ssol_material** mtl);
 
 SSOL_API res_T
 ssol_material_ref_get
@@ -340,9 +354,9 @@ ssol_material_ref_put
   (struct ssol_material* mtl);
 
 SSOL_API res_T
-ssol_miror_setup
+ssol_mirror_set_shader
   (struct ssol_material* mtl,
-   const struct ssol_miror_desc* desc);
+   const struct ssol_mirror_shader* shader);
 
 /*******************************************************************************
  * Object API - Opaque abstraction of a geometry with its associated properties.
diff --git a/src/ssol_shape.c b/src/ssol_shape.c
@@ -17,9 +17,9 @@
 #include "ssol_shape_c.h"
 #include "ssol_device_c.h"
 
-#include <rsys\rsys.h>
-#include <rsys\mem_allocator.h>
-#include <rsys\ref_count.h>
+#include <rsys/rsys.h>
+#include <rsys/mem_allocator.h>
+#include <rsys/ref_count.h>
 
 /*******************************************************************************
 * Helper functions
@@ -316,4 +316,4 @@ ssol_mesh_setup
   res = s3d_mesh_setup_indexed_vertices(shape->shape, ntris, get_indices, nverts, _attrib3, nattribs, data);
   MEM_RM(shape->dev->allocator, _attrib3);
   return res;
-}
-\ No newline at end of file
+}