Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-02 11:51:31 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-02 11:51:31 +0300
commit0ddf3e110ef0f1f69ef785db867e581f813ee9a7 (patch)
tree4afbadc141cd4072a4ea0bb11205acee72cd6dc6 /source/blender/physics
parent8a3b548cb2b2c7a05a4d0a1c613f788d38a04e85 (diff)
Cleanup: comment blocks
Diffstat (limited to 'source/blender/physics')
-rw-r--r--source/blender/physics/intern/implicit_blender.c39
-rw-r--r--source/blender/physics/intern/implicit_eigen.cpp6
2 files changed, 26 insertions, 19 deletions
diff --git a/source/blender/physics/intern/implicit_blender.c b/source/blender/physics/intern/implicit_blender.c
index 5fd9c6b50de..e4d93b72f73 100644
--- a/source/blender/physics/intern/implicit_blender.c
+++ b/source/blender/physics/intern/implicit_blender.c
@@ -68,14 +68,15 @@
static float I[3][3] = {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}};
static float ZERO[3][3] = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
-/*
+#if 0
#define C99
#ifdef C99
#defineDO_INLINE inline
#else
#defineDO_INLINE static
#endif
-*/
+#endif /* if 0 */
+
struct Cloth;
//////////////////////////////////////////
@@ -383,14 +384,18 @@ DO_INLINE void inverse_fmatrix(float to[3][3], float from[3][3])
int i2=(i+2)%3;
int j1=(j+1)%3;
int j2=(j+2)%3;
- // reverse indexs i&j to take transpose
+ /** Reverse indexs i&j to take transpose. */
to[j][i] = (from[i1][j1]*from[i2][j2]-from[i1][j2]*from[i2][j1])/d;
- /*
- if (i==j)
- to[i][j] = 1.0f / from[i][j];
- else
- to[i][j] = 0;
- */
+ /**
+ * <pre>
+ * if (i == j) {
+ * to[i][j] = 1.0f / from[i][j];
+ * }
+ * else {
+ * to[i][j] = 0;
+ * }
+ * </pre>
+ */
}
}
@@ -916,7 +921,8 @@ DO_INLINE void BuildPPinv(fmatrix3x3 *lA, fmatrix3x3 *P, fmatrix3x3 *Pinv)
}
}
-/*
+
+#if 0
// version 1.3
static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv)
{
@@ -988,7 +994,8 @@ static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector
return iterations<conjgrad_looplimit;
}
-*/
+#endif
+
// version 1.4
static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector *z, fmatrix3x3 *S, fmatrix3x3 *P, fmatrix3x3 *Pinv, fmatrix3x3 *bigI)
{
@@ -1031,7 +1038,7 @@ static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector
// deltaNew = r^TP
deltaNew = dot_lfvector(r, p, numverts);
- /*
+#if 0
filter(dv, S);
add_lfvector_lfvector(dv, dv, z, numverts);
@@ -1045,7 +1052,7 @@ static int cg_filtered_pre(lfVector *dv, fmatrix3x3 *lA, lfVector *lB, lfVector
deltaNew = dot_lfvector(r, p, numverts);
delta0 = deltaNew * sqrt(conjgrad_epsilon);
- */
+#endif
#ifdef DEBUG_TIME
double start = PIL_check_seconds_timer();
@@ -1541,8 +1548,8 @@ BLI_INLINE bool spring_length(Implicit_Data *data, int i, int j, float r_extent[
*r_length = len_v3(r_extent);
if (*r_length > ALMOST_ZERO) {
- /*
- if (length>L) {
+#if 0
+ if (length > L) {
if ((clmd->sim_parms->flags & CSIMSETT_FLAG_TEARING_ENABLED) &&
( ((length-L)*100.0f/L) > clmd->sim_parms->maxspringlen ))
{
@@ -1551,7 +1558,7 @@ BLI_INLINE bool spring_length(Implicit_Data *data, int i, int j, float r_extent[
return false;
}
}
- */
+#endif
mul_v3_v3fl(r_dir, r_extent, 1.0f/(*r_length));
}
else {
diff --git a/source/blender/physics/intern/implicit_eigen.cpp b/source/blender/physics/intern/implicit_eigen.cpp
index eaac63893a6..fd91df9c769 100644
--- a/source/blender/physics/intern/implicit_eigen.cpp
+++ b/source/blender/physics/intern/implicit_eigen.cpp
@@ -900,8 +900,8 @@ BLI_INLINE bool spring_length(Implicit_Data *data, int i, int j, float r_extent[
*r_length = len_v3(r_extent);
if (*r_length > ALMOST_ZERO) {
- /*
- if (length>L) {
+#if 0
+ if (length > L) {
if ((clmd->sim_parms->flags & CSIMSETT_FLAG_TEARING_ENABLED) &&
( ((length-L)*100.0f/L) > clmd->sim_parms->maxspringlen ))
{
@@ -910,7 +910,7 @@ BLI_INLINE bool spring_length(Implicit_Data *data, int i, int j, float r_extent[
return false;
}
}
- */
+#endif
mul_v3_v3fl(r_dir, r_extent, 1.0f/(*r_length));
}
else {