External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-12-26 02:25:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cglm-structs

Browse Source
This commit is contained in:
Alejandro Coto Gutiérrez
2019-04-08 19:17:52 -05:00
committed by GitHub
parent c25469829a 81a74ba225
commit 1de8aeb940
17 changed files with 109 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/cglm/affine-mat.h
View File

@@ -152,7 +152,7 @@ glm_inv_tr(mat4 mat) {
glm_inv_tr_sse2(mat);
#else
CGLM_ALIGN_MAT mat3 r;
CGLM_ALIGN(16) vec3 t;
CGLM_ALIGN(8) vec3 t;
/* rotate */
glm_mat4_pick3t(mat, r);

2
include/cglm/bezier.h
View File

@@ -8,6 +8,8 @@
#ifndef cglm_bezier_h
#define cglm_bezier_h
#include "common.h"
#define GLM_BEZIER_MAT_INIT {{-1.0f, 3.0f, -3.0f, 1.0f}, \
{ 3.0f, -6.0f, 3.0f, 0.0f}, \
{-3.0f, 3.0f, 0.0f, 0.0f}, \

1
include/cglm/common.h
View File

@@ -14,6 +14,7 @@
#include <stddef.h>
#include <math.h>
#include <float.h>
#include <stdbool.h>
#if defined(_MSC_VER)
# ifdef CGLM_DLL

1
include/cglm/project.h
View File

@@ -8,6 +8,7 @@
#ifndef cglm_project_h
#define cglm_project_h
#include "common.h"
#include "vec3.h"
#include "vec4.h"
#include "mat4.h"

1
include/cglm/util.h
View File

@@ -19,7 +19,6 @@
#define cglm_util_h
#include "common.h"
#include <stdbool.h>
#define GLM_MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
#define GLM_MAX(X, Y) (((X) > (Y)) ? (X) : (Y))

3
include/cglm/vec3-ext.h
View File

@@ -31,9 +31,6 @@
#include "common.h"
#include "util.h"
#include <stdbool.h>
#include <math.h>
#include <float.h>
/*!
* @brief fill a vector with specified value

4
include/cglm/vec3.h
View File

@@ -428,8 +428,8 @@ glm_vec3_maxadd(vec3 a, vec3 b, vec3 dest) {
*
* it applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] b scalar
* @param[in] a vector 1
* @param[in] b vector 2
* @param[out] dest dest += min(a, b)
*/
CGLM_INLINE

3
include/cglm/vec4-ext.h
View File

@@ -31,9 +31,6 @@
#include "common.h"
#include "vec3-ext.h"
#include <stdbool.h>
#include <math.h>
#include <float.h>
/*!
* @brief fill a vector with specified value

4
include/cglm/vec4.h
View File

@@ -576,8 +576,8 @@ glm_vec4_maxadd(vec4 a, vec4 b, vec4 dest) {
*
* it applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] b scalar
* @param[in] a vector 1
* @param[in] b vector 2
* @param[out] dest dest += min(a, b)
*/
CGLM_INLINE

2
include/cglm/version.h
View File

@@ -10,6 +10,6 @@
#define CGLM_VERSION_MAJOR 0
#define CGLM_VERSION_MINOR 5
#define CGLM_VERSION_PATCH 3
#define CGLM_VERSION_PATCH 4
#endif /* cglm_version_h */