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

Reestructured folders and applied a bugfix

Browse Source
This commit is contained in:
Irlan 2019-06-24 11:33:05 -03:00
parent 5bb247c79b
commit 028d8e101c
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
include/bounce/softbody/softbody_contact_solver.h → include/bounce/softbody/contacts/softbody_contact_solver.h
View File

0
include/bounce/softbody/softbody_node_body_contact.h → include/bounce/softbody/contacts/softbody_node_body_contact.h
View File

2
include/bounce/softbody/softbody_contact_manager.h
View File

@ -19,7 +19,7 @@
#ifndef B3_SOFTBODY_CONTACT_MANAGER_H
#define B3_SOFTBODY_CONTACT_MANAGER_H
#include <bounce/softbody/softbody_node_body_contact.h>
#include <bounce/softbody/contacts/softbody_node_body_contact.h>
#include <bounce/collision/broad_phase.h>
#include <bounce/common/memory/block_pool.h>
#include <bounce/common/template/list.h>

4
src/bounce/softbody/softbody_contact_solver.cpp → src/bounce/softbody/contacts/softbody_contact_solver.cpp
View File

@ -16,8 +16,8 @@
* 3. This notice may not be removed or altered from any source distribution.
*/
#include <bounce/softbody/softbody_contact_solver.h>
#include <bounce/softbody/softbody_node_body_contact.h>
#include <bounce/softbody/contacts/softbody_contact_solver.h>
#include <bounce/softbody/contacts/softbody_node_body_contact.h>
#include <bounce/softbody/softbody_node.h>
#include <bounce/dynamics/shapes/shape.h>
#include <bounce/dynamics/body.h>

2
src/bounce/softbody/softbody_node_body_contact.cpp → src/bounce/softbody/contacts/softbody_node_body_contact.cpp
View File

@ -16,7 +16,7 @@
* 3. This notice may not be removed or altered from any source distribution.
*/
#include <bounce/softbody/softbody_node_body_contact.h>
#include <bounce/softbody/contacts/softbody_node_body_contact.h>
#include <bounce/softbody/softbody_node.h>
#include <bounce/dynamics/shapes/shape.h>
#include <bounce/dynamics/body.h>

4
src/bounce/softbody/softbody_solver.cpp
View File

@ -21,7 +21,7 @@
#include <bounce/softbody/softbody_node.h>
#include <bounce/softbody/softbody.h>
#include <bounce/softbody/softbody_force_solver.h>
#include <bounce/softbody/softbody_contact_solver.h>
#include <bounce/softbody/contacts/softbody_contact_solver.h>
#include <bounce/dynamics/body.h>
#include <bounce/dynamics/shapes/shape.h>
@ -32,7 +32,7 @@ b3SoftBodySolver::b3SoftBodySolver(const b3SoftBodySolverDef& def)
m_mesh = m_body->m_mesh;
m_nodes = m_body->m_nodes;
m_elements = m_body->m_elements;
m_bodyContactCapacity = m_mesh->vertexCount;
m_bodyContactCapacity = m_body->m_contactManager.m_nodeBodyContactList.m_count;
m_bodyContactCount = 0;
m_bodyContacts = (b3NodeBodyContact**)m_allocator->Allocate(m_bodyContactCapacity * sizeof(b3NodeBodyContact*));
}