tadd more vector operations - slidergrid - grid of elastic sliders on a frictio… | |
git clone git://src.adamsgaard.dk/slidergrid | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 6155ad1224ca7ba4eb0aa38cb8618f4bc6889b30 | |
parent b6375bd6ba85b2129dcc4e88057883d4f6c9f458 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Tue, 15 Mar 2016 13:23:20 -0700 | |
add more vector operations | |
Diffstat: | |
M slider.c | 2 ++ | |
M vector_math.c | 5 +++++ | |
M vector_math.h | 6 ++++++ | |
3 files changed, 13 insertions(+), 0 deletions(-) | |
--- | |
diff --git a/slider.c b/slider.c | |
t@@ -15,6 +15,8 @@ void integrate_kinematics(slider s, Float dt, int iteration) | |
if (iteration == 0) { | |
Float3 acc0 = make_float3(0., 0., 0.); | |
+ } else { | |
+ Float3 acc0 = s.acc; | |
} | |
diff --git a/vector_math.c b/vector_math.c | |
t@@ -25,3 +25,8 @@ inline Float3 divide_float3(Float3 v1, Float3 v2) | |
{ | |
return make_float3(v1.x / v2.x, v1.y / v2.y, v1.z / v2.z); | |
} | |
+ | |
+inline Float3 copy_float3(Float3 v) | |
+{ | |
+ return make_float3(v.x, v.y, v.z); | |
+} | |
diff --git a/vector_math.h b/vector_math.h | |
t@@ -2,3 +2,9 @@ | |
inline Float3 make_float3(Float x, Float y, Float z); | |
+inline Float3 add_float3(Float x, Float y, Float z); | |
+inline Float3 subtract_float3(Float x, Float y, Float z); | |
+inline Float3 multiply_float3(Float x, Float y, Float z); | |
+inline Float3 divide_float3(Float x, Float y, Float z); | |
+ | |
+inline Float3 copy_float3(Float3 v); |