regenerated documentation

Author: svenwoop

CHANGELOG.md

@@ -3,14 +3,17 @@ Version History
 
 ### New Features in Embree 3.6
 -   Added Catmull-Rom curve types.
+-   Added support for multi-level instancing.
+-   Added support for point queries.
 -   Fixed a bug preventing normal oriented curves being used unless timesteps were
     specified.
 -   Fixed bug in external BVH builder when configured for dynamic build.
 -   Added support for new config flag "user_threads=N" to device initialization
     which sets the number of threads used by TBB but created by the user.
+-   Fixed automatic vertex buffer padding when using rtcSetNewGeometry API function.
 
 ### New Features in Embree 3.5.2
--   Added EMBREE_ISA_NAMESPACE cmake option that allows to put all Embree API functions
+-   Added EMBREE_API_NAMESPACE cmake option that allows to put all Embree API functions
     inside a user defined namespace.
 -   Added EMBREE_LIBRARY_NAME cmake option that allows to rename the Embree library.
 -   When Embree is compiled as static library, EMBREE_STATIC_LIB has no longer to get

README.md

@@ -14,15 +14,15 @@ RTCHit\ \-\ single\ hit\ structure
 
 struct\ RTCHit
 {
-\ \ float\ Ng_x;\ \ \ \ \ \ \ \ \ \ //\ x\ coordinate\ of\ geometry\ normal
-\ \ float\ Ng_y;\ \ \ \ \ \ \ \ \ \ //\ y\ coordinate\ of\ geometry\ normal
-\ \ float\ Ng_z;\ \ \ \ \ \ \ \ \ \ //\ z\ coordinate\ of\ geometry\ normal
+\ \ float\ Ng_x;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ x\ coordinate\ of\ geometry\ normal
+\ \ float\ Ng_y;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ y\ coordinate\ of\ geometry\ normal
+\ \ float\ Ng_z;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ z\ coordinate\ of\ geometry\ normal
 
-\ \ float\ u;\ \ \ \ \ \ \ \ \ \ \ \ \ //\ barycentric\ u\ coordinate\ of\ hit
-\ \ float\ v;\ \ \ \ \ \ \ \ \ \ \ \ \ //\ barycentric\ v\ coordinate\ of\ hit
+\ \ float\ u;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ barycentric\ u\ coordinate\ of\ hit
+\ \ float\ v;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ barycentric\ v\ coordinate\ of\ hit
 
-\ \ unsigned\ int\ primID;\ //\ geometry\ ID
-\ \ unsigned\ int\ geomID;\ //\ primitive\ ID
+\ \ unsigned\ int\ primID;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ geometry\ ID
+\ \ unsigned\ int\ geomID;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ //\ primitive\ ID
 \ \ unsigned\ int\ instID[RTC_MAX_INSTANCE_LEVEL_COUNT];\ //\ instance\ ID
 };
 \f[]
@@ -35,8 +35,8 @@ The hit contains the unnormalized geometric normal in object space at
 the hit location (\f[C]Ng_x\f[], \f[C]Ng_y\f[], \f[C]Ng_z\f[] members),
 the barycentric u/v coordinates of the hit (\f[C]u\f[] and \f[C]v\f[]
 members), as well as the primitive ID (\f[C]primID\f[] member), geometry
-ID (\f[C]geomID\f[] member), and instance ID (\f[C]instID\f[] member) of
-the hit.
+ID (\f[C]geomID\f[] member), and instance ID stack (\f[C]instID\f[]
+member) of the hit.
 The parametric intersection distance is not stored inside the hit, but
 stored inside the \f[C]tfar\f[] member of the ray.
 .PP
@@ -49,4 +49,4 @@ packets of an arbitrary compile\-time size.
 .SS EXIT STATUS
 .SS SEE ALSO
 .PP
-[RTCRay]
+[RTCRay], [Multi\-Level Instancing]

man/man3/RTCHit.3embree3

@@ -23,7 +23,7 @@ float&\ RTCHitN_v(RTCHitN*\ hit,\ unsigned\ int\ N,\ unsigned\ int\ i);
 
 unsigned&\ RTCHitN_primID(RTCHitN*\ hit,\ unsigned\ int\ N,\ unsigned\ int\ i);
 unsigned&\ RTCHitN_geomID(RTCHitN*\ hit,\ unsigned\ int\ N,\ unsigned\ int\ i);
-unsigned&\ RTCHitN_instID(RTCHitN*\ hit,\ unsigned\ int\ N,\ unsigned\ int\ i,\ unsigned\ int\ l);
+unsigned&\ RTCHitN_instID(RTCHitN*\ hit,\ unsigned\ int\ N,\ unsigned\ int\ i,\ unsigned\ int\ level);
 \f[]
 .fi
 .SS DESCRIPTION

man/man3/RTCHitN.3embree3

@@ -15,6 +15,9 @@ RTC_GEOMETRY_TYPE_FLAT_BSPLINE_CURVE\ \-\
 RTC_GEOMETRY_TYPE_FLAT_HERMITE_CURVE\ \-\ 
 \ \ flat\ curve\ geometry\ with\ cubic\ Hermite\ basis
 
+RTC_GEOMETRY_TYPE_FLAT_CATMULL_ROM_CURVE\ \-\ 
+\ \ flat\ curve\ geometry\ with\ Catmull\-Rom\ basis
+
 RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BEZIER_CURVE\ \-
 \ \ flat\ normal\ oriented\ curve\ geometry\ with\ cubic\ Bézier\ basis
 
@@ -24,6 +27,9 @@ RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BSPLINE_CURVE\ \-\
 RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_HERMITE_CURVE\ \-\ 
 \ \ flat\ normal\ oriented\ curve\ geometry\ with\ cubic\ Hermite\ basis
 
+RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_CATMULL_ROM_CURVE\ \-\ 
+\ \ flat\ normal\ oriented\ curve\ geometry\ with\ Catmull\-Rom\ basis
+
 RTC_GEOMETRY_TYPE_ROUND_BEZIER_CURVE\ \-
 \ \ sweep\ surface\ curve\ geometry\ with\ cubic\ Bézier\ basis
 
@@ -32,6 +38,9 @@ RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE\ \-
 
 RTC_GEOMETRY_TYPE_ROUND_HERMITE_CURVE\ \-
 \ \ sweep\ surface\ curve\ geometry\ with\ cubic\ Hermite\ basis
+
+RTC_GEOMETRY_TYPE_ROUND_CATMULL_ROM_CURVE\ \-
+\ \ sweep\ surface\ curve\ geometry\ with\ Catmull\-Rom\ basis
 \f[]
 .fi
 .SS SYNOPSIS
@@ -44,12 +53,15 @@ rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_FLAT_LINEAR_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_FLAT_BEZIER_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_FLAT_BSPLINE_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_FLAT_HERMITE_CURVE);
+rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_FLAT_CATMULL_ROM_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BEZIER_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BSPLINE_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_HERMITE_CURVE);
+rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_CATMULL_ROM_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_ROUND_BEZIER_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE);
 rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_ROUND_HERMITE_CURVE);
+rtcNewGeometry(device,\ RTC_GEOMETRY_TYPE_ROUND_CATMULL_ROM_CURVE);
 \f[]
 .fi
 .SS DESCRIPTION
@@ -61,12 +73,15 @@ Such curve geometries are created by passing
 \f[C]RTC_GEOMETRY_TYPE_FLAT_BEZIER_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_FLAT_BSPLINE_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_FLAT_HERMITE_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_FLAT_CATMULL_ROM_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_FLAT_BEZIER_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_FLAT_BSPLINE_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_FLAT_HERMITE_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_FLAT_CATMULL_ROM_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_ROUND_BEZIER_CURVE\f[],
-\f[C]RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE\f[], or
-\f[C]RTC_GEOMETRY_TYPE_ROUND_HERMITE_CURVE\f[] to the
+\f[C]RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_ROUND_HERMITE_CURVE\f[], or
+\f[C]RTC_GEOMETRY_TYPE_ROUND_CATMULL_ROM_CURVE\f[] to the
 \f[C]rtcNewGeometry\f[] function.
 The curve indices can be specified through an index buffer
 (\f[C]RTC_BUFFER_TYPE_INDEX\f[]) and the curve vertices through a vertex
@@ -140,6 +155,10 @@ Different versions of Catmull\-Rom splines can be easily constructed
 usig the Hermite basis, by calculating a proper tangent buffer from the
 control points.
 .PP
+For the Catmull\-Rom basis the indices point to the first of 4
+consecutive control points in the vertex buffer.
+This basis goes through p0 and p3, with p0\-p1 and p2\-p3 tangents.
+.PP
 The \f[C]RTC_GEOMETRY_TYPE_FLAT_*\f[] flat mode is a fast mode designed
 to render distant hair.
 In this mode the curve is rendered as a connected sequence of ray facing

man/man3/RTC_GEOMETRY_TYPE_CURVE.3embree3

@@ -23,9 +23,16 @@ matrix plus translation).
 As the instanced scene is stored only a single time, even if instanced
 to multiple locations, this feature can be used to create very complex
 scenes with small memory footprint.
-Only single\-level instancing is supported natively by Embree, however,
-multi\-level instancing can be manually implemented through user
-geometries.
+.PP
+Embree supports both single\-level instancing and multi\-level
+instancing.
+The maximum instance nesting depth is
+\f[C]RTC_MAX_INSTANCE_LEVEL_COUNT\f[]; it can be configured at
+compile\-time using the constant
+\f[C]EMBREE_MAX_INSTANCE_LEVEL_COUNT\f[].
+Users should adapt this constant to their needs: instances nested any
+deeper are silently ignored in release mode, and cause assertions in
+debug mode.
 .PP
 Instances are created by passing \f[C]RTC_GEOMETRY_TYPE_INSTANCE\f[] to
 the \f[C]rtcNewGeometry\f[] function call.
@@ -60,8 +67,8 @@ specified using the \f[C]rtcSetGeometryTimeStepCount\f[] function.
 Then a transformation for each time step can be specified using the
 \f[C]rtcSetGeometryTransform\f[] function.
 .PP
-See tutorial [Instanced Geometry] for an example of how to use
-instances.
+See tutorials [Instanced Geometry] and [Multi Level Instancing] for
+examples of how to use instances.
 .SS EXIT STATUS
 .PP
 On failure \f[C]NULL\f[] is returned and an error code is set that can

man/man3/RTC_GEOMETRY_TYPE_INSTANCE.3embree3

@@ -27,10 +27,10 @@ setting a vertex buffer (\f[C]RTC_BUFFER_TYPE_VERTEX\f[] type).
 See \f[C]rtcSetGeometryBuffer\f[] and
 \f[C]rtcSetSharedGeometryBuffer\f[] for more details on how to set
 buffers.
-The index buffer contains an array of three 32\-bit indices per triangle
-(\f[C]RTC_FORMAT_UINT\f[] format) and the number of primitives is
-inferred from the size of that buffer.
-The vertex buffer contains an array of single precision \f[C]x\f[],
+The index buffer must contain an array of three 32\-bit indices per
+triangle (\f[C]RTC_FORMAT_UINT3\f[] format) and the number of primitives
+is inferred from the size of that buffer.
+The vertex buffer must contain an array of single precision \f[C]x\f[],
 \f[C]y\f[], \f[C]z\f[] floating point coordinates
 (\f[C]RTC_FORMAT_FLOAT3\f[] format), and the number of vertices are
 inferred from the size of that buffer.

man/man3/RTC_GEOMETRY_TYPE_TRIANGLE.3embree3

@@ -23,6 +23,16 @@ This internally triggers building of a spatial acceleration structure
 for the scene using all available worker threads.
 Ray queries can be performed only after committing all scene changes.
 .PP
+If scene geometries get modified or attached or detached, the
+\f[C]rtcCommitScene\f[] call must be invoked before performing any
+further ray queries for the scene; otherwise the effect of the ray query
+is undefined.
+The modification of a geometry, committing the scene, and tracing of
+rays must always happen sequentially, and never at the same time.
+Any API call that sets a property of the scene or geometries contained
+in the scene count as scene modification, e.g.
+including setting of intersection filter functions.
+.PP
 The kind of acceleration structure built can be influenced using scene
 flags (see \f[C]rtcSetSceneFlags\f[]), and the quality can be specified
 using the \f[C]rtcSetSceneBuildQuality\f[] function.

man/man3/rtcCommitScene.3embree3

@@ -23,6 +23,7 @@ struct\ RTCIntersectContext
 {
 \ \ enum\ RTCIntersectContextFlags\ flags;
 \ \ RTCFilterFunctionN\ filter;
+\ \ unsigned\ int\ instStackSize;
 \ \ unsigned\ int\ instID[RTC_MAX_INSTANCE_LEVEL_COUNT];
 };
 
@@ -36,9 +37,9 @@ void\ rtcInitIntersectContext(
 A per ray\-query intersection context (\f[C]RTCIntersectContext\f[]
 type) is supported that can be used to configure intersection flags
 (\f[C]flags\f[] member), specify a filter callback function
-(\f[C]filter\f[] member), specify the ID of the current instance
-(\f[C]instID\f[] member), and to attach arbitrary data to the query
-(e.g.
+(\f[C]filter\f[] member), specify the chain of IDs of the current
+instance (\f[C]instID\f[] and \f[C]instStackSize\f[] members), and to
+attach arbitrary data to the query (e.g.
 per ray data).
 .PP
 The \f[C]rtcInitIntersectContext\f[] function initializes the context to

man/man3/rtcInitIntersectContext.3embree3

@@ -0,0 +1,58 @@
+.TH "rtcInitPointQueryInstanceStack" "3" "" "" "Embree Ray Tracing Kernels 3"
+.SS NAME
+.IP
+.nf
+\f[C]
+rtcInitPointQueryInstanceStack\ \-\ initializes\ the\ stack\ of\ (multilevel\-)instance
+\ \ information\ for\ point\ queries
+\f[]
+.fi
+.SS SYNOPSIS
+.IP
+.nf
+\f[C]
+#include\ <embree3/rtcore.h>
+
+struct\ RTC_ALIGN(16)\ RTCPointQueryInstanceStack
+{
+\ \ //\ accumulated\ 4x4\ column\ major\ matrices\ from\ world\ to\ instance\ space.
+\ \ float\ world2inst[RTC_MAX_INSTANCE_LEVEL_COUNT][16];
+\ \ 
+\ \ //\ accumulated\ 4x4\ column\ major\ matrices\ from\ instance\ to\ world\ space.
+\ \ float\ inst2world[RTC_MAX_INSTANCE_LEVEL_COUNT][16];
+
+\ \ //\ instance\ ids.
+\ \ unsigned\ int\ instID[RTC_MAX_INSTANCE_LEVEL_COUNT];
+\ \ 
+\ \ //\ number\ of\ instances\ currently\ on\ the\ stack.
+\ \ unsigned\ int\ size;
+};
+
+void\ rtcInitPointQueryInstanceStack(
+\ \ struct\ RTCPointQueryInstanceStack*\ instStack
+);
+\f[]
+.fi
+.SS DESCRIPTION
+.PP
+A stack (\f[C]RTCPointQueryInstanceStack\f[] type) which stores the IDs
+and instance transformations during a BVH traversal for a point query.
+.PP
+The \f[C]rtcInitPointQueryStack\f[] function initializes the stack to
+default values and should be called for initialization.
+.PP
+The stack will be passed as an argument to the point query callback
+function (see [rtcSetGeometryPointQueryFunction]) and should be used to
+pass instance information down the instancing chain for user defined
+instancing (see tutorial [ClosestPoint] for a reference implementation
+of point queries with user defined instancing).
+.PP
+The stack is an necessary argument to [rtcPointQuery] and Embree
+internally uses the topmost instance tranformation of the stack to
+transform the point query into instance space.
+.SS EXIT STATUS
+.PP
+No error code is set by this function.
+.SS SEE ALSO
+.PP
+[rtcPointQuery], [rtcSetGeometryPointQueryFunction]

man/man3/rtcInitPointQueryInstanceStack.3embree3

@@ -40,9 +40,8 @@ The ray segment has to be in the range [0, ∞], thus ranges that start
 behind the ray origin are not valid, but ranges can reach to infinity.
 See Section [RTCRay] for the ray layout description.
 .PP
-The instance ID (\f[C]instID\f[] hit member) and geometry ID
-(\f[C]geomID\f[] hit member) of the hit data must be initialized to
-\f[C]RTC_INVALID_GEOMETRY_ID\f[] (\-1).
+The geometry ID (\f[C]geomID\f[] hit member) of the hit data must be
+initialized to \f[C]RTC_INVALID_GEOMETRY_ID\f[] (\-1).
 .PP
 Further, an intersection context for the ray query function must be
 created and initialized (see \f[C]rtcInitIntersectContext\f[]).
@@ -52,20 +51,21 @@ When an intersection is found, the hit distance is written into the
 \f[C]tfar\f[] member of the ray and all hit data is set, such as
 unnormalized geometry normal in object space (\f[C]Ng\f[] hit member),
 local hit coordinates (\f[C]u\f[], \f[C]v\f[] hit member), instance ID
-(\f[C]instID\f[] hit member), geometry ID (\f[C]geomID\f[] hit member),
-and primitive ID (\f[C]primID\f[] hit member).
+stack (\f[C]instID\f[] hit member), geometry ID (\f[C]geomID\f[] hit
+member), and primitive ID (\f[C]primID\f[] hit member).
 See Section [RTCHit] for the hit layout description.
 .PP
-If the instance ID was set (thus it is not equal to
-\f[C]RTC_INVALID_GEOMETRY_ID\f[]), the instance ID corresponds to the
-geometry ID of the hit instance of the top\-level scene, the geometry ID
-corresponds to the hit geometry inside the hit instanced scene, and the
-primitive ID corresponds to the n\-th primitive of that geometry.
+If the instance ID stack has a prefix of values not equal to
+\f[C]RTC_INVALID_GEOMETRY_ID\f[], the instance ID on each level
+corresponds to the geometry ID of the hit instance of the higher\-level
+scene, the geometry ID corresponds to the hit geometry inside the hit
+instanced scene, and the primitive ID corresponds to the n\-th primitive
+of that geometry.
 .PP
-If the instance ID was not set (thus it is still equal to
-\f[C]RTC_INVALID_GEOMETRY_ID\f[]), the geometry ID corresponds to the
-hit geometry inside the scene, and the primitive ID corresponds to the
-n\-th primitive of that geometry.
+If level 0 of the instance ID stack is equal to
+\f[C]RTC_INVALID_GEOMETRY_ID\f[], the geometry ID corresponds to the hit
+geometry inside the top\-level scene, and the primitive ID corresponds
+to the n\-th primitive of that geometry.
 .PP
 The implementation makes no guarantees that primitives whose hit
 distance is exactly at (or very close to) \f[C]tnear\f[] or

man/man3/rtcIntersect1.3embree3

@@ -57,6 +57,15 @@ The following configuration is supported:
 A value of 0 enables all detected hardware threads.
 By default all hardware threads are used.
 .IP \[bu] 2
+\f[C]user_threads=[int]\f[]: Sets the number of user threads that can be
+used to join and participate in a scene commit using
+\f[C]rtcJoinCommitScene\f[].
+The tasking system will only use threads\-user_threads many worker
+threads, thus if the app wants to solely use its threads to commit
+scenes, just set threads equal to user_threads.
+This option only has effect with the Intel(R) Threading Building Blocks
+(TBB) tasking system.
+.IP \[bu] 2
 \f[C]set_affinity=[0/1]\f[]: When enabled, build threads are affinitized
 to hardware threads.
 This option is disabled by default on standard CPUs, and enabled by

man/man3/rtcNewDevice.3embree3

@@ -59,22 +59,27 @@ with different bases (\f[C]RTC_GEOMETRY_TYPE_FLAT_LINEAR_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_FLAT_BEZIER_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_FLAT_BSPLINE_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_FLAT_CATMULL_ROM_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_ROUND_CATMULL_ROM_CURVE\f[],
 \f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BEZIER_CURVE\f[],
-\f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BSPLINE_CURVE\f[] types), grid
-meshes (\f[C]RTC_GEOMETRY_TYPE_GRID\f[]), point geometries
+\f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_BSPLINE_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_NORMAL_ORIENTED_CATMULL_ROM_CURVE\f[] types),
+grid meshes (\f[C]RTC_GEOMETRY_TYPE_GRID\f[]), point geometries
 (\f[C]RTC_GEOMETRY_TYPE_SPHERE_POINT\f[],
 \f[C]RTC_GEOMETRY_TYPE_DISC_POINT\f[],
 \f[C]RTC_TYPE_ORIENTED_DISC_POINT\f[]), user\-defined geometries
 (\f[C]RTC_GEOMETRY_TYPE_USER\f[]), and instances
 (\f[C]RTC_GEOMETRY_TYPE_INSTANCE\f[]).
 .PP
-The types \f[C]RTC_GEOMETRY_TYPE_ROUND_BEZIER_CURVE\f[] and
-\f[C]RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE\f[] will treat the curve as a
-sweep surface of a varying\-radius circle swept tangentially along the
-curve.
-The types \f[C]RTC_GEOMETRY_TYPE_FLAT_BEZIER_CURVE\f[] and
-\f[C]RTC_GEOMETRY_TYPE_FLAT_BSPLINE_CURVE\f[] use ray\-facing ribbons as
-a faster\-to\-intersect approximation.
+The types \f[C]RTC_GEOMETRY_TYPE_ROUND_BEZIER_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_ROUND_BSPLINE_CURVE\f[], and
+\f[C]RTC_GEOMETRY_TYPE_ROUND_CATMULL_ROM_CURVE\f[] will treat the curve
+as a sweep surface of a varying\-radius circle swept tangentially along
+the curve.
+The types \f[C]RTC_GEOMETRY_TYPE_FLAT_BEZIER_CURVE\f[],
+\f[C]RTC_GEOMETRY_TYPE_FLAT_BSPLINE_CURVE\f[], and
+\f[C]RTC_GEOMETRY_TYPE_FLAT_CATMULL_ROM_CURVE\f[] use ray\-facing
+ribbons as a faster\-to\-intersect approximation.
 .PP
 After construction, geometries are enabled by default and not attached
 to any scene.

man/man3/rtcNewGeometry.3embree3

@@ -31,7 +31,7 @@ At construction time, the pointer to the user\-managed buffer data
 (\f[C]ptr\f[] argument) including its size in bytes (\f[C]byteSize\f[]
 argument) is provided to create the buffer.
 At buffer construction time no buffer data is allocated, but the buffer
-data provided be the application is used.
+data provided by the application is used.
 The buffer data must remain valid for as long as the buffer may be used,
 and the user is responsible to free the buffer data when no longer
 required.