commit 9a6f2dec21115343758c9ff9530b2e8a5a832f93
parent a66e360264907cfed2c33044027efd357ed2ffd9
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 26 Oct 2016 15:44:39 +0200
Fix comments and coding style
Diffstat:
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/s3d.h b/src/s3d.h
@@ -105,8 +105,8 @@ struct s3d_primitive {
void* inst__;
};
-#define S3D_PRIMITIVE_NULL__ {\
- S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, NULL, NULL\
+#define S3D_PRIMITIVE_NULL__ { \
+ S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, NULL, NULL \
}
static const struct s3d_primitive S3D_PRIMITIVE_NULL = S3D_PRIMITIVE_NULL__;
@@ -150,11 +150,11 @@ struct s3d_hit {
};
/* Constant defining a NULL intersection. Should be used to initialize a hit */
-#define S3D_HIT_NULL__ {\
- { S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, NULL, NULL },\
- { 0.f, 0.f, 0.f },\
- { 0.f, 0.f },\
- FLT_MAX\
+#define S3D_HIT_NULL__ { \
+ {S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, S3D_INVALID_ID, NULL, NULL},\
+ {0.f, 0.f, 0.f}, \
+ {0.f, 0.f}, \
+ FLT_MAX \
}
static const struct s3d_hit S3D_HIT_NULL = S3D_HIT_NULL__;
@@ -175,11 +175,11 @@ enum s3d_scene_view_flag {
* discarded and a value not equal to zero otherwise. */
typedef int
(*s3d_hit_filter_function_T)
- (const struct s3d_hit* hit,
- const float ray_org[3],
- const float ray_dir[3],
- void* ray_data, /* User data submitted on trace ray(s) invocation */
- void* filter_data); /* Data defined on the setup of the filter function */
+ (const struct s3d_hit* hit,
+ const float ray_org[3],
+ const float ray_dir[3],
+ void* ray_data, /* User data submitted on trace ray(s) invocation */
+ void* filter_data); /* Data defined on the setup of the filter function */
/* Forward declaration of s3d opaque data types */
struct s3d_device; /* Entry point of the library */
@@ -322,7 +322,7 @@ s3d_scene_view_trace_rays
const size_t sizeof_ray_data, /* Size in Bytes of *one* ray data */
struct s3d_hit* hits);
-/* Uniformly sample the scene and returned the sampled primitive and its sample
+/* Uniformly sample the scene and return the sampled primitive and its sample
* uv position. Can be called only if the scnview was created with the
* S3D_SAMPLE flag */
S3D_API res_T
@@ -509,7 +509,7 @@ s3d_mesh_get_hit_filter_data
* Instance API - An instance is a shape that encapsulates a scene and that
* supports a local to world transformation. Since the scene geometry is stored
* only a single time even though it is instantiated in several positions, one
- * can use this feature to create extremely large scene
+ * can use this feature to create extremely large scene.
******************************************************************************/
S3D_API res_T
s3d_instance_set_position