AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

early out, bugfix

Browse Source
This commit is contained in:
Irlan
2018-06-28 21:55:49 -03:00
parent 0154db4b77
commit 8ebdb67a75
5 changed files with 32 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/bounce/dynamics/cloth/particle.h
View File

@ -89,8 +89,8 @@ public:
b3Shape* s2;
float32 s;
bool f1_active, f2_active;
b3FrictionForce f1, f2;
bool f_active;
b3FrictionForce f;
bool n_active, t1_active, t2_active;
b3Vec3 n, t1, t2;

26
include/bounce/dynamics/cloth/sparse_sym_mat33.h
View File

@ -85,6 +85,11 @@ inline const b3Mat33& b3SparseSymMat33::operator()(u32 i, u32 j) const
u32 row_value_index = row_value_begin + row_value;
u32 row_value_column = value_columns[row_value_index];
if (row_value_column < j)
{
break;
}
if (row_value_column == j)
{
return values[row_value_index];
@ -112,7 +117,12 @@ inline b3Mat33& b3SparseSymMat33::operator()(u32 i, u32 j)
{
u32 row_value_index = row_value_begin + row_value;
u32 row_value_column = value_columns[row_value_index];
if (row_value_column < j)
{
break;
}
if (row_value_column == j)
{
return values[row_value_index];
@ -120,30 +130,30 @@ inline b3Mat33& b3SparseSymMat33::operator()(u32 i, u32 j)
}
// Find insert position
u32 row_value_k = 0;
u32 row_value_position = 0;
for (u32 row_value = 0; row_value < row_value_count; ++row_value)
{
u32 row_value_index = row_value_begin + row_value;
u32 row_value_column = value_columns[row_value_index];
if (row_value_column >= j)
if (row_value_column > j)
{
row_value_k = row_value;
row_value_position = row_value;
break;
}
}
// Shift the values
B3_ASSERT(value_count < value_capacity);
for (u32 row_value = value_count; row_value > row_value_begin + row_value_k; --row_value)
for (u32 row_value = value_count; row_value > row_value_begin + row_value_position; --row_value)
{
values[row_value] = values[row_value - 1];
value_columns[row_value] = value_columns[row_value - 1];
}
// Insert the value
value_columns[row_value_begin + row_value_k] = j;
values[row_value_begin + row_value_k].SetZero();
value_columns[row_value_begin + row_value_position] = j;
values[row_value_begin + row_value_position].SetZero();
++value_count;
// Shift the row pointers
@ -153,7 +163,7 @@ inline b3Mat33& b3SparseSymMat33::operator()(u32 i, u32 j)
}
// Return the inserted value
return values[row_value_begin + row_value_k];
return values[row_value_begin + row_value_position];
}
inline void b3SparseSymMat33::Diagonal(b3DiagMat33& out) const