External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2025-10-04 01:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare varables at top of scope for ivec[2|3|4]

Browse Source
This commit is contained in:
Christopher Lang
2022-05-20 17:30:54 +01:00
parent e3981b6d96
commit 838124af49
6 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/cglm/ivec2.h
View File

@@ -171,8 +171,9 @@ glm_ivec2_scale(ivec2 v, int s, ivec2 dest) {
CGLM_INLINE
int
glm_ivec2_distance2(ivec2 a, ivec2 b) {
int xd = a[0] - b[0];
int yd = a[1] - b[1];
int xd, yd;
xd = a[0] - b[0];
yd = a[1] - b[1];
return xd * xd + yd * yd;
}

7
include/cglm/ivec3.h
View File

@@ -179,9 +179,10 @@ glm_ivec3_scale(ivec3 v, int s, ivec3 dest) {
CGLM_INLINE
int
glm_ivec3_distance2(ivec3 a, ivec3 b) {
int xd = a[0] - b[0];
int yd = a[1] - b[1];
int zd = a[2] - b[2];
int xd, yd, zd;
xd = a[0] - b[0];
yd = a[1] - b[1];
zd = a[2] - b[2];
return xd * xd + yd * yd + zd * zd;
}

9
include/cglm/ivec4.h
View File

@@ -188,10 +188,11 @@ glm_ivec4_scale(ivec4 v, int s, ivec4 dest) {
CGLM_INLINE
int
glm_ivec4_distance2(ivec4 a, ivec4 b) {
int xd = a[0] - b[0];
int yd = a[1] - b[1];
int zd = a[2] - b[2];
int wd = a[3] - b[3];
int xd, yd, zd, wd;
xd = a[0] - b[0];
yd = a[1] - b[1];
zd = a[2] - b[2];
wd = a[3] - b[3];
return xd * xd + yd * yd + zd * zd + wd * wd;
}

7
test/src/test_ivec2.h
View File

@@ -58,6 +58,7 @@ TEST_IMPL(GLM_PREFIX, ivec2_add) {
ivec2 a = {14, 3};
ivec2 b = {-3, 2};
ivec2 v = {99, 99};
GLM(ivec2_add)(a, b, v);
ASSERT(v[0] == 11)
ASSERT(v[1] == 5)
@@ -128,8 +129,9 @@ TEST_IMPL(GLM_PREFIX, ivec2_scale) {
TEST_IMPL(GLM_PREFIX, ivec2_distance2) {
ivec2 a = {-1, 3};
ivec2 b = {5, 4};
int v;
int v = GLM(ivec2_distance2)(a, b);
v = GLM(ivec2_distance2)(a, b);
ASSERT(v == 37)
TEST_SUCCESS
@@ -138,8 +140,9 @@ TEST_IMPL(GLM_PREFIX, ivec2_distance2) {
TEST_IMPL(GLM_PREFIX, ivec2_distance) {
ivec2 a = {3, 2};
ivec2 b = {-2, 5};
float v;
float v = GLM(ivec2_distance)(a, b);
v = GLM(ivec2_distance)(a, b);
ASSERT(test_eq(v, 5.8309518948))
TEST_SUCCESS

7
test/src/test_ivec3.h
View File

@@ -57,6 +57,7 @@ TEST_IMPL(GLM_PREFIX, ivec3_add) {
ivec3 a = {14, 3, 2};
ivec3 b = {-3, 2, 1};
ivec3 v = {99, 99, 99};
GLM(ivec3_add)(a, b, v);
ASSERT(v[0] == 11)
ASSERT(v[1] == 5)
@@ -133,8 +134,9 @@ TEST_IMPL(GLM_PREFIX, ivec3_scale) {
TEST_IMPL(GLM_PREFIX, ivec3_distance2) {
ivec3 a = {-1, 3, 0};
ivec3 b = {5, 4, 2};
int v;
int v = GLM(ivec3_distance2)(a, b);
v = GLM(ivec3_distance2)(a, b);
ASSERT(v == 41)
TEST_SUCCESS
@@ -143,8 +145,9 @@ TEST_IMPL(GLM_PREFIX, ivec3_distance2) {
TEST_IMPL(GLM_PREFIX, ivec3_distance) {
ivec3 a = {3, 2, 4};
ivec3 b = {-2, 5, 2};
float v;
float v = GLM(ivec3_distance)(a, b);
v = GLM(ivec3_distance)(a, b);
ASSERT(test_eq(v, 6.1644140029))
TEST_SUCCESS

7
test/src/test_ivec4.h
View File

@@ -61,6 +61,7 @@ TEST_IMPL(GLM_PREFIX, ivec4_add) {
ivec4 a = {14, 3, 2, -4};
ivec4 b = {-3, 2, 1, -1};
ivec4 v = {99, 99, 99, 99};
GLM(ivec4_add)(a, b, v);
ASSERT(v[0] == 11)
ASSERT(v[1] == 5)
@@ -143,8 +144,9 @@ TEST_IMPL(GLM_PREFIX, ivec4_scale) {
TEST_IMPL(GLM_PREFIX, ivec4_distance2) {
ivec4 a = {-1, 3, 0, 4};
ivec4 b = {5, 4, 2, 6};
int v;
int v = GLM(ivec4_distance2)(a, b);
v = GLM(ivec4_distance2)(a, b);
ASSERT(v == 45)
TEST_SUCCESS
@@ -153,8 +155,9 @@ TEST_IMPL(GLM_PREFIX, ivec4_distance2) {
TEST_IMPL(GLM_PREFIX, ivec4_distance) {
ivec4 a = {3, 2, 4, -1};
ivec4 b = {-2, 5, 2, 4};
float v;
float v = GLM(ivec4_distance)(a, b);
v = GLM(ivec4_distance)(a, b);
ASSERT(test_eq(v, 7.9372539331))
TEST_SUCCESS