commit 76ee77a09f4eff1df3fd0657b7fcb3cadc5d4f76
parent 0121707f40e64b2ca509ed9184147e1929f212b2
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 15 Nov 2018 16:17:16 +0100
Merge branch 'release_0.2'
Diffstat:
6 files changed, 109 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
@@ -10,7 +10,9 @@ through 3D primitives whose Z component is assumed to be 0 or infinity. The
scene ray-tracing can thus be performed in the XY 2D plane or in fictive 3D
world where a line segment is actually a plane extruded to [-infinity,
+infinity] along the Z dimension. To ensure high ray tracing efficiency, the
-Star-2D back-end heavily relies on the Intel [Embree](https://embree.github.io)
+Star-2D back-end heavily relies on the
+[Intel® Rendering Framework](https://software.intel.com/sdvis):
+[Embree](https://embree.github.io)
library that provides several ray-tracing kernels optimized for a wide range of
data workloads. The target users of Star-2D are thus programmers that have to
efficiently deal with complex 2D environment as numerical simulation engineers
@@ -94,6 +96,11 @@ with `<STAR2D_INSTALL_DIR>` the install directory of Star-2D and
## Release notes
+### Version 0.2
+
+- Add the `s2d_segment_get_vertex_attrib` function that returns the vertex
+ attributes of a given segment.
+
### Version 0.1.1
- Fix the `s2d_primitive_get_function`. The function failed when the submitted
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -52,8 +52,8 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys Embree)
# Configure and define targets
################################################################################
set(VERSION_MAJOR 0)
-set(VERSION_MINOR 1)
-set(VERSION_PATCH 1)
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 0)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(S2D_FILES_SRC
@@ -85,10 +85,18 @@ set_source_files_properties(${S2D_FILES_SRC} PROPERTIES LANGUAGE CXX)
add_library(s2d SHARED ${S2D_FILES_SRC} ${S2D_FILES_INC} ${S2D_FILES_INC_API})
target_link_libraries(s2d RSys ${EMBREE_LIBRARY})
-if(CMAKE_COMPILER_IS_GNUCXX)
+if(CMAKE_COMPILER_IS_GNUCC)
target_link_libraries(s2d m)
endif()
+if(MSVC)
+ ### disable verbose warnings:
+ # warning C4127: conditional expression is constant
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4127")
+ # warning C4312: 'operation' : conversion from 'type1' to 'type2' of greater size
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4312")
+endif()
+
set_target_properties(s2d PROPERTIES
DEFINE_SYMBOL S2D_SHARED_BUILD
LINKER_LANGUAGE CXX
diff --git a/src/s2d.h b/src/s2d.h
@@ -402,6 +402,13 @@ s2d_primitive_compute_length
(const struct s2d_primitive* prim,
float* area);
+S2D_API res_T
+s2d_segment_get_vertex_attrib
+ (const struct s2d_primitive* prim,
+ const size_t ivertex, /* in [0..2[ */
+ const enum s2d_attrib_usage usage,
+ struct s2d_attrib* attrib); /* Resulting attrib */
+
/*******************************************************************************
* Line Segments API - manage a list of segments
******************************************************************************/
diff --git a/src/s2d_line_segments.c b/src/s2d_line_segments.c
@@ -132,7 +132,7 @@ line_setup_positions
lines->update_mask |= (VERTEX_BUFFER & ~lines->resize_mask);
} else {
lines->resize_mask |= VERTEX_BUFFER;
- lines->update_mask &= !VERTEX_BUFFER;
+ lines->update_mask &= ~VERTEX_BUFFER;
}
/* Release the old vertex buffer */
@@ -589,7 +589,7 @@ line_segments_copy_indexed_vertices
dst->update_mask = (VERTEX_BUFFER & ~dst->resize_mask);
} else {
dst->resize_mask |= VERTEX_BUFFER;
- dst->update_mask &= !VERTEX_BUFFER;
+ dst->update_mask &= ~VERTEX_BUFFER;
}
FOR_EACH(i, 0, S2D_ATTRIBS_COUNT__) {
diff --git a/src/s2d_primitive.c b/src/s2d_primitive.c
@@ -27,12 +27,25 @@
* knowledge of the CeCILL license and that you accept its terms. */
#include "s2d.h"
+#include "s2d_c.h"
#include "s2d_geometry.h"
#include "s2d_line_segments.h"
#include <rsys/float2.h>
/*******************************************************************************
+ * Helper functions
+ ******************************************************************************/
+static int
+check_primitive(const struct s2d_primitive* prim)
+{
+ return prim
+ && prim->geom_id != S2D_INVALID_ID
+ && prim->prim_id != S2D_INVALID_ID
+ && prim->mesh__ != NULL;
+}
+
+/*******************************************************************************
* Exported functions
******************************************************************************/
res_T
@@ -46,20 +59,13 @@ s2d_primitive_get_attrib
struct geometry* geom = NULL;
res_T res = RES_OK;
- if(!prim
+ if(!check_primitive(prim)
|| !attrib
|| (usage != S2D_GEOMETRY_NORMAL && (unsigned)usage >= S2D_ATTRIBS_COUNT__)) {
res = RES_BAD_ARG;
goto error;
}
- if(prim->geom_id == S2D_INVALID_ID
- || prim->prim_id == S2D_INVALID_ID
- || prim->mesh__ == NULL) {
- res = RES_BAD_ARG;
- goto error;
- }
-
/* Unnormalized barycentric coordinates */
if(s < 0.f || s > 1.f) {
res = RES_BAD_ARG;
@@ -126,7 +132,7 @@ s2d_primitive_sample
const float u,
float* s)
{
- if(!prim || S2D_PRIMITIVE_EQ(prim, &S2D_PRIMITIVE_NULL) || !s)
+ if(!check_primitive(prim) || !s)
return RES_BAD_ARG;
if(u < 0.f || u >= 1.f)
@@ -148,7 +154,7 @@ s2d_primitive_compute_length(const s2d_primitive* prim, float* length)
float tmp[2];
struct geometry* geom;
- if(!prim || !length || S2D_PRIMITIVE_EQ(prim, &S2D_PRIMITIVE_NULL))
+ if(!check_primitive(prim) || !length)
return RES_BAD_ARG;
geom = (struct geometry*)prim->mesh__;
@@ -160,3 +166,52 @@ s2d_primitive_compute_length(const s2d_primitive* prim, float* length)
return RES_OK;
}
+res_T
+s2d_segment_get_vertex_attrib
+ (const struct s2d_primitive* prim,
+ const size_t ivertex, /* in [0..2[ */
+ const enum s2d_attrib_usage usage,
+ struct s2d_attrib* attrib) /* Resulting attrib */
+{
+ struct geometry* geom;
+ const uint32_t* ids;
+
+ if(!check_primitive(prim) || ivertex > 1
+ || (unsigned)usage >= S2D_ATTRIBS_COUNT__ || !attrib) {
+ return RES_BAD_ARG;
+ }
+
+ geom = (struct geometry*)prim->mesh__;
+ ASSERT(prim->geom_id == geom->name);
+
+ /* The segment have not the required attrib */
+ if(!geom->lines->attribs[usage]) {
+ return RES_BAD_ARG;
+ }
+
+ /* Out of bound primitive index */
+ if(prim->prim_id >= line_segments_get_nverts(geom->lines)) {
+ return RES_BAD_ARG;
+ }
+
+ ids = line_segments_get_ids(geom->lines) + prim->prim_id*2/*#segment ids*/;
+ attrib->usage = usage;
+
+ if(usage != S2D_POSITION) {
+ const float* attr;
+ unsigned i, dim;
+ attrib->type = geom->lines->attribs_type[usage];
+ /* Fetch attrib data */
+ dim = s2d_type_get_dimension(attrib->type);
+ attr = line_segments_get_attr(geom->lines, usage) + ids[ivertex]*dim;
+ FOR_EACH(i, 0, dim) attrib->value[i] = attr[i];
+ } else {
+ const float* pos;
+ attrib->type = S2D_FLOAT2;
+ /* Fetch data */
+ pos = line_segments_get_pos(geom->lines) + ids[ivertex]*2;
+ f2_set(attrib->value, pos);
+ }
+ return RES_OK;
+}
+
diff --git a/src/test_s2d_primitive.c b/src/test_s2d_primitive.c
@@ -108,7 +108,6 @@ main(int argc, char** argv)
CHK(s2d_scene_view_create(scn, S2D_GET_PRIMITIVE, &scnview) == RES_OK);
CHK(s2d_scene_view_primitives_count(scnview, &nprims) == RES_OK);
CHK(nprims == 4);
- CHK(s2d_scene_view_ref_put(scnview) == RES_OK);
CHK(s2d_primitive_compute_length(NULL, NULL) == RES_BAD_ARG);
CHK(s2d_primitive_compute_length(&prim, NULL) == RES_BAD_ARG);
@@ -124,7 +123,7 @@ main(int argc, char** argv)
CHK(s2d_primitive_sample(&prim, 2.f, &s) == RES_BAD_ARG);
CHK(s2d_primitive_sample(NULL, 0.5f, &s) == RES_BAD_ARG);
CHK(s2d_primitive_sample(&prim, 0.5f, &s) == RES_OK);
- CHK(eq_epsf(s, 0.5f, 1.e-6f) == 1);
+ CHK(eq_epsf(s, 0.5f, 1.e-6f));
FOR_EACH(i, 0, NSAMPS) {
CHK(s2d_primitive_sample(&prim, rand_canonic(), &s) == RES_OK);
@@ -132,8 +131,23 @@ main(int argc, char** argv)
CHK(s <= 1.f);
}
+ CHK(s2d_scene_view_get_primitive(scnview, 0, &prim) == RES_OK);
+
+ #define GET_VERTEX_ATTR s2d_segment_get_vertex_attrib
+ CHK(GET_VERTEX_ATTR(NULL, 0, S2D_POSITION, &attr) == RES_BAD_ARG);
+ CHK(GET_VERTEX_ATTR(&prim, 2, S2D_POSITION, &attr) == RES_BAD_ARG);
+ CHK(GET_VERTEX_ATTR(&prim, 0, S2D_GEOMETRY_NORMAL, &attr) == RES_BAD_ARG);
+ CHK(GET_VERTEX_ATTR(&prim, 0, S2D_POSITION, NULL) == RES_BAD_ARG);
+ CHK(GET_VERTEX_ATTR(&prim, 0, S2D_POSITION, &attr) == RES_OK);
+ CHK(attr.type == S2D_FLOAT2);
+ CHK(f2_eq_eps(attr.value, square_verts + square_ids[0]*2, 1.e-6f));
+ CHK(GET_VERTEX_ATTR(&prim, 1, S2D_POSITION, &attr) == RES_OK);
+ CHK(attr.type == S2D_FLOAT2);
+ CHK(f2_eq_eps(attr.value, square_verts + square_ids[1]*2, 1.e-6f));
+
CHK(s2d_device_ref_put(dev) == RES_OK);
CHK(s2d_scene_ref_put(scn) == RES_OK);
+ CHK(s2d_scene_view_ref_put(scnview) == RES_OK);
CHK(s2d_shape_ref_put(shape) == RES_OK);
check_memory_allocator(&allocator);
