commit 9f290fea5e8052e894755869a937761271bb233d
parent 4cfe40ab2ae623efca898e4f7213e52f31d98a6a
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 24 May 2017 12:16:20 +0200
Rename the medium absorptivity in absorption
Diffstat:
10 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/src/parser/solparser_medium.c b/src/parser/solparser_medium.c
@@ -28,7 +28,7 @@ parse_medium
yaml_node_t* medium,
struct solparser_medium_id* out_imedium)
{
- enum { ABSORPTIVITY, REFRACTIVE_INDEX };
+ enum { ABSORPTION, REFRACTIVE_INDEX };
struct solparser_medium* mdm = NULL;
size_t* pimedium = NULL;
size_t imedium = SIZE_MAX;
@@ -81,9 +81,9 @@ parse_medium
} \
mask |= BIT(Flag); \
} (void)0
- if(!strcmp((char*)key->data.scalar.value, "absorptivity")) {
- SETUP_MASK(ABSORPTIVITY, "absorptivity");
- res = parse_mtl_data(parser, doc, val, 0, DBL_MAX, &mdm->absorptivity);
+ if(!strcmp((char*)key->data.scalar.value, "absorption")) {
+ SETUP_MASK(ABSORPTION, "absorption");
+ res = parse_mtl_data(parser, doc, val, 0, DBL_MAX, &mdm->absorption);
} else if(!strcmp((char*)key->data.scalar.value, "refractive_index")) {
SETUP_MASK(REFRACTIVE_INDEX, "refractive_index");
res = parse_mtl_data
@@ -107,7 +107,7 @@ parse_medium
res = RES_BAD_ARG; \
goto error; \
} (void)0
- CHECK_PARAM(ABSORPTIVITY, "absorptivity");
+ CHECK_PARAM(ABSORPTION, "absorption");
CHECK_PARAM(REFRACTIVE_INDEX, "refractive_index");
#undef CHECK_PARAM
diff --git a/src/parser/solparser_medium.h b/src/parser/solparser_medium.h
@@ -21,7 +21,7 @@
struct solparser_medium {
struct solparser_mtl_data refractive_index;
- struct solparser_mtl_data absorptivity;
+ struct solparser_mtl_data absorption;
};
struct solparser_medium_id { size_t i; };
diff --git a/src/parser/test_solparser7.c b/src/parser/test_solparser7.c
@@ -54,13 +54,13 @@ main(int argc, char** argv)
fprintf(stream, " thickness: 0.123\n");
fprintf(stream, " medium_i: &outside\n");
fprintf(stream, " refractive_index: 1\n");
- fprintf(stream, " absorptivity: 0\n");
+ fprintf(stream, " absorption: 0\n");
fprintf(stream, " medium_t: &inside\n");
fprintf(stream, " refractive_index: \n");
fprintf(stream, " - {wavelength: 1.2, data: 2.3}\n");
fprintf(stream, " - {wavelength: 4.5, data: 6.7}\n");
fprintf(stream, " - {wavelength: 0.5, data: 0.25}\n");
- fprintf(stream, " absorptivity:\n");
+ fprintf(stream, " absorption:\n");
fprintf(stream, " - {wavelength: 3, data: 3}\n");
fprintf(stream, " - {wavelength: 1, data: 1}\n");
fprintf(stream, " - {wavelength: 5, data: 5}\n");
@@ -98,8 +98,8 @@ main(int argc, char** argv)
medium = solparser_get_medium(parser, thin->medium_i);
CHECK(medium->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(medium->refractive_index.value.real, 1);
- CHECK(medium->absorptivity.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(medium->absorptivity.value.real, 0);
+ CHECK(medium->absorption.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(medium->absorption.value.real, 0);
medium = solparser_get_medium(parser, thin->medium_t);
CHECK(medium->refractive_index.type, SOLPARSER_MTL_DATA_SPECTRUM);
@@ -112,8 +112,8 @@ main(int argc, char** argv)
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].data, 2.3);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[2].data, 6.7);
- CHECK(medium->absorptivity.type, SOLPARSER_MTL_DATA_SPECTRUM);
- spectrum = solparser_get_spectrum(parser, medium->absorptivity.value.spectrum);
+ CHECK(medium->absorption.type, SOLPARSER_MTL_DATA_SPECTRUM);
+ spectrum = solparser_get_spectrum(parser, medium->absorption.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 5);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 2);
diff --git a/src/parser/test_solparser8.c b/src/parser/test_solparser8.c
@@ -45,10 +45,10 @@ main(int argc, char** argv)
NCHECK(stream, NULL);
fprintf(stream, "- sun: { dni: 1, spectrum: [{wavelength: 1, data: 1 }] }\n");
- fprintf(stream, "- medium: &vacuum {refractive_index: 1, absorptivity: 0}\n");
+ fprintf(stream, "- medium: &vacuum {refractive_index: 1, absorption: 0}\n");
fprintf(stream, "- medium: &glass \n");
fprintf(stream, " refractive_index: 1.5\n");
- fprintf(stream, " absorptivity: \n");
+ fprintf(stream, " absorption: \n");
fprintf(stream, " - {wavelength: 1, data: 21}\n");
fprintf(stream, " - {wavelength: 2, data: 22}\n");
fprintf(stream, " - {wavelength: 3, data: 23}\n");
@@ -99,14 +99,14 @@ main(int argc, char** argv)
vacuum = solparser_get_medium(parser, dielec->medium_i);
CHECK(vacuum->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(vacuum->refractive_index.value.real, 1);
- CHECK(vacuum->absorptivity.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(vacuum->absorptivity.value.real, 0);
+ CHECK(vacuum->absorption.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(vacuum->absorption.value.real, 0);
glass = solparser_get_medium(parser, dielec->medium_t);
CHECK(glass->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(glass->refractive_index.value.real, 1.5);
- CHECK(glass->absorptivity.type, SOLPARSER_MTL_DATA_SPECTRUM);
- spectrum = solparser_get_spectrum(parser, glass->absorptivity.value.spectrum);
+ CHECK(glass->absorption.type, SOLPARSER_MTL_DATA_SPECTRUM);
+ spectrum = solparser_get_spectrum(parser, glass->absorption.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 6);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 2);
diff --git a/src/parser/test_solparser_normal_map.c b/src/parser/test_solparser_normal_map.c
@@ -40,8 +40,8 @@ test_dielectric(struct solparser* parser)
fprintf(stream, "- material: &glass\n");
fprintf(stream, " front:\n");
fprintf(stream, " dielectric:\n");
- fprintf(stream, " medium_i: &out {refractive_index: 1, absorptivity: 0}\n");
- fprintf(stream, " medium_t: &in {refractive_index: 1.5, absorptivity: 20}\n");
+ fprintf(stream, " medium_i: &out {refractive_index: 1, absorption: 0}\n");
+ fprintf(stream, " medium_t: &in {refractive_index: 1.5, absorption: 20}\n");
fprintf(stream, " normal_map: {path: my_normal_map}\n");
fprintf(stream, " back: {dielectric: {medium_i: *in, medium_t: *out}}\n");
fprintf(stream, "\n");
@@ -267,10 +267,10 @@ test_thin_dielectric(struct solparser* parser)
fprintf(stream, " thickness: 0.1\n");
fprintf(stream, " medium_i:\n");
fprintf(stream, " refractive_index: 1\n");
- fprintf(stream, " absorptivity: 0\n");
+ fprintf(stream, " absorption: 0\n");
fprintf(stream, " medium_t:\n");
fprintf(stream, " refractive_index: 1.5\n");
- fprintf(stream, " absorptivity: 20\n");
+ fprintf(stream, " absorption: 20\n");
fprintf(stream, " normal_map: { path: Bump }\n");
rewind(stream);
diff --git a/src/parser/test_solparser_spectrum.c b/src/parser/test_solparser_spectrum.c
@@ -204,16 +204,16 @@ test_thin_dielectric(struct solparser* parser)
fprintf(stream, " - { wavelength: 123, data: 1.1 }\n");
fprintf(stream, " - { wavelength: 456, data: 2.2 }\n");
fprintf(stream, " - { wavelength: 789, data: 3.3 }\n");
- fprintf(stream, "- spectrum: &absorptivity\n");
+ fprintf(stream, "- spectrum: &absorption\n");
fprintf(stream, " - { wavelength: 0.456, data: 0.2 }\n");
fprintf(stream, " - { wavelength: 0.123, data: 0.1 }\n");
fprintf(stream, "- material:\n");
fprintf(stream, " thin_dielectric:\n");
fprintf(stream, " thickness: 1\n");
- fprintf(stream, " medium_i: { refractive_index: 1, absorptivity: 0 }\n");
+ fprintf(stream, " medium_i: { refractive_index: 1, absorption: 0 }\n");
fprintf(stream, " medium_t: \n");
fprintf(stream, " refractive_index: *refractive_index\n");
- fprintf(stream, " absorptivity: *absorptivity\n");
+ fprintf(stream, " absorption: *absorption\n");
rewind(stream);
CHECK(solparser_setup(parser, NULL, stream), RES_OK);
@@ -232,8 +232,8 @@ test_thin_dielectric(struct solparser* parser)
mdm = solparser_get_medium(parser, thin->medium_i);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(mdm->refractive_index.value.real, 1);
- CHECK(mdm->absorptivity.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(mdm->absorptivity.value.real, 0);
+ CHECK(mdm->absorption.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(mdm->absorption.value.real, 0);
mdm = solparser_get_medium(parser, thin->medium_t);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_SPECTRUM);
@@ -245,7 +245,7 @@ test_thin_dielectric(struct solparser* parser)
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].data, 1.1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].data, 2.2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[2].data, 3.3);
- spectrum = solparser_get_spectrum(parser, mdm->absorptivity.value.spectrum);
+ spectrum = solparser_get_spectrum(parser, mdm->absorption.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 0.123);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 0.456);
@@ -276,15 +276,15 @@ test_dielectric(struct solparser* parser)
fprintf(stream, " - { wavelength: 123, data: 1.1 }\n");
fprintf(stream, " - { wavelength: 456, data: 2.2 }\n");
fprintf(stream, " - { wavelength: 789, data: 3.3 }\n");
- fprintf(stream, "- spectrum: &absorptivity\n");
+ fprintf(stream, "- spectrum: &absorption\n");
fprintf(stream, " - { wavelength: 0.456, data: 0.2 }\n");
fprintf(stream, " - { wavelength: 0.123, data: 0.1 }\n");
fprintf(stream, "- material:\n");
fprintf(stream, " dielectric:\n");
- fprintf(stream, " medium_i: { refractive_index: 1, absorptivity: 0 }\n");
+ fprintf(stream, " medium_i: { refractive_index: 1, absorption: 0 }\n");
fprintf(stream, " medium_t: \n");
fprintf(stream, " refractive_index: *refractive_index\n");
- fprintf(stream, " absorptivity: *absorptivity\n");
+ fprintf(stream, " absorption: *absorption\n");
rewind(stream);
CHECK(solparser_setup(parser, NULL, stream), RES_OK);
@@ -302,8 +302,8 @@ test_dielectric(struct solparser* parser)
mdm = solparser_get_medium(parser, dielec->medium_i);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_REAL);
CHECK(mdm->refractive_index.value.real, 1);
- CHECK(mdm->absorptivity.type, SOLPARSER_MTL_DATA_REAL);
- CHECK(mdm->absorptivity.value.real, 0);
+ CHECK(mdm->absorption.type, SOLPARSER_MTL_DATA_REAL);
+ CHECK(mdm->absorption.value.real, 0);
mdm = solparser_get_medium(parser, dielec->medium_t);
CHECK(mdm->refractive_index.type, SOLPARSER_MTL_DATA_SPECTRUM);
@@ -315,7 +315,7 @@ test_dielectric(struct solparser* parser)
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].data, 1.1);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].data, 2.2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[2].data, 3.3);
- spectrum = solparser_get_spectrum(parser, mdm->absorptivity.value.spectrum);
+ spectrum = solparser_get_spectrum(parser, mdm->absorption.value.spectrum);
CHECK(darray_spectrum_data_size_get(&spectrum->data), 2);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[0].wavelength, 0.123);
CHECK(darray_spectrum_data_cdata_get(&spectrum->data)[1].wavelength, 0.456);
diff --git a/src/parser/yaml/test_ko_0.yaml b/src/parser/yaml/test_ko_0.yaml
@@ -252,31 +252,31 @@
# medium_t: <dielectric-medium>
#
-# invalid absorptivity
+# invalid absorption
- material:
thin_dielectric:
thickness: 0
- medium_i: &m { refractive_index: 1, absorptivity: -1 }
+ medium_i: &m { refractive_index: 1, absorption: -1 }
medium_t: *m
---
# invalid thickness
- material:
thin_dielectric:
thickness: -0.01
- medium_i: &m { refractive_index: 1, absorptivity: 0 }
+ medium_i: &m { refractive_index: 1, absorption: 0 }
medium_t: *m
---
# invalid refractive index
- material:
thin_dielectric:
thickness: 0
- medium_i: &m { refractive_index: 0, absorptivity: 0 }
+ medium_i: &m { refractive_index: 0, absorption: 0 }
medium_t: *m
---
# missing thickness
- material:
thin_dielectric:
- medium_i: &m { refractive_index: 1, absorptivity: 0 }
+ medium_i: &m { refractive_index: 1, absorption: 0 }
medium_t: *m
---
@@ -290,22 +290,22 @@
# invalid refractive_index
- material:
dielectric:
- medium_i: &m { refractive_index: 0, absorptivity: 0 }
+ medium_i: &m { refractive_index: 0, absorption: 0 }
medium_t: *m
---
-# invalid absorptivity
+# invalid absorption
- material:
dielectric:
- medium_i: &m { refractive_index: 1, absorptivity: -1 }
+ medium_i: &m { refractive_index: 1, absorption: -1 }
medium_t: *m
---
# missing refractive_index
- material:
dielectric:
- medium_i: &m { absorptivity: 0 }
+ medium_i: &m { absorption: 0 }
medium_t: *m
---
-# missing absorptivity
+# missing absorption
- material:
dielectric:
medium_i: &m { refractive_index: 1 }
@@ -314,12 +314,12 @@
# missing medium_i
- material:
dielectric:
- medium_t: { refractive_index: 1, absorptivity: 0 }
+ medium_t: { refractive_index: 1, absorption: 0 }
---
# missing medium_t
- material:
dielectric:
- medium_i: { refractive_index: 1, absorptivity: 0 }
+ medium_i: { refractive_index: 1, absorption: 0 }
---
#
diff --git a/src/parser/yaml/test_ok_5.yaml b/src/parser/yaml/test_ok_5.yaml
@@ -3,8 +3,8 @@
- material: &thin_dielectric
thin_dielectric:
thickness: 1
- medium_i: { absorptivity: 0, refractive_index: 1.00027 }
- medium_t: { absorptivity: 0.1, refractive_index: 1.5 }
+ medium_i: { absorption: 0, refractive_index: 1.00027 }
+ medium_t: { absorption: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -18,8 +18,8 @@
- material: &thin_dielectric
thin_dielectric:
thickness: 0
- medium_i: { absorptivity: 0, refractive_index: 0.00027 }
- medium_t: { absorptivity: 0.1, refractive_index: 1.5 }
+ medium_i: { absorption: 0, refractive_index: 0.00027 }
+ medium_t: { absorption: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -38,6 +38,6 @@
material:
thin_dielectric:
thickness: 10
- medium_i: { absorptivity: 0, refractive_index: 1 }
- medium_t: { absorptivity: 20, refractive_index: 1.5 }
+ medium_i: { absorption: 0, refractive_index: 1 }
+ medium_t: { absorption: 20, refractive_index: 1.5 }
diff --git a/src/parser/yaml/test_ok_7.yaml b/src/parser/yaml/test_ok_7.yaml
@@ -2,8 +2,8 @@
- material: &dielectric
dielectric:
- medium_i: { absorptivity: 0, refractive_index: 1.00027 }
- medium_t: { absorptivity: 0.1, refractive_index: 1.5 }
+ medium_i: { absorption: 0, refractive_index: 1.00027 }
+ medium_t: { absorption: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -16,8 +16,8 @@
- material: &dielectric
dielectric:
- medium_i: { absorptivity: 0, refractive_index: 0.00027 }
- medium_t: { absorptivity: 0.1, refractive_index: 1.5 }
+ medium_i: { absorption: 0, refractive_index: 0.00027 }
+ medium_t: { absorption: 0.1, refractive_index: 1.5 }
- entity:
name: "entity"
@@ -35,13 +35,13 @@
- cylinder: { height: 1, radius: 1 }
material:
dielectric:
- medium_i: { absorptivity: 0, refractive_index: 1 }
- medium_t: { absorptivity: 20, refractive_index: 1.5 }
+ medium_i: { absorption: 0, refractive_index: 1 }
+ medium_t: { absorption: 20, refractive_index: 1.5 }
---
- sun: { dni: 1 }
-- medium: &vacuum { refractive_index: 1, absorptivity: 0 }
-- medium: &glass { refractive_index: 1.5, absorptivity: 20 }
+- medium: &vacuum { refractive_index: 1, absorption: 0 }
+- medium: &glass { refractive_index: 1.5, absorption: 20 }
- entity:
name: "entity"
primary: 0
diff --git a/src/solstice_material.c b/src/solstice_material.c
@@ -335,8 +335,8 @@ create_material_dielectric
} (void)0
SET_SSOL_DATA(medium_i, refractive_index);
SET_SSOL_DATA(medium_t, refractive_index);
- SET_SSOL_DATA(medium_i, absorptivity);
- SET_SSOL_DATA(medium_t, absorptivity);
+ SET_SSOL_DATA(medium_i, absorption);
+ SET_SSOL_DATA(medium_t, absorption);
#undef SET_SSOL_DATA
SSOL(dielectric_setup(mtl, &shader, &ssol_medium_i, &ssol_medium_t));
@@ -547,8 +547,8 @@ create_material_thin_dielectric
} (void)0
SET_SSOL_DATA(medium_i, refractive_index);
SET_SSOL_DATA(medium_t, refractive_index);
- SET_SSOL_DATA(medium_i, absorptivity);
- SET_SSOL_DATA(medium_t, absorptivity);
+ SET_SSOL_DATA(medium_i, absorption);
+ SET_SSOL_DATA(medium_t, absorption);
#undef SET_SSOL_DATA
SSOL(thin_dielectric_setup
(mtl, &shader, &ssol_medium_i, &ssol_medium_t, thin->thickness));
