Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove test baseplate on load

This commit is contained in:
floralrainfall 2023-07-22 04:23:52 -04:00
parent 0fc6b0cb54
commit 6c767b2061
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Projects/Engine/Source/App/Humanoid/Humanoid.cpp
View File

@ -37,14 +37,6 @@ namespace RNR
void Humanoid::buildJoints() void Humanoid::buildJoints()
{ {
if(getTorso() && getHead())
{
Weld* headWeld = new Weld();
headWeld->setBodies(getTorso(), getHead());
headWeld->link();
headWeld->setParent(getTorso());
}
if(getTorso()) if(getTorso())
{ {
btTransform ghostTransform; btTransform ghostTransform;
@ -148,8 +140,6 @@ namespace RNR
move = direction * move; move = direction * move;
move *= world->getComPlicitNgine()->getLastPhysicsDelta(); move *= world->getComPlicitNgine()->getLastPhysicsDelta();
m_characterController->playerStep(world->getDynamicsWorld(), forward);
bool move_valid = true; bool move_valid = true;
// TODO: collision checking // TODO: collision checking

7
Projects/Engine/Source/App/V8/World/World.cpp
View File

@ -109,6 +109,13 @@ namespace RNR
{ {
m_refs.clear(); m_refs.clear();
Instance* baseplate = findFirstChild("Baseplate");
if(baseplate)
{
baseplate->setParent(NULL);
delete baseplate;
}
JointsService* joints = (JointsService*)m_datamodel->getService("JointsService"); JointsService* joints = (JointsService*)m_datamodel->getService("JointsService");
Camera* old_camera = m_workspace->getCurrentCamera(); Camera* old_camera = m_workspace->getCurrentCamera();
if(old_camera) if(old_camera)