TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'alpha40_pathshape' of https://github.com/Azaezel/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2020-03-03 10:47:49 -06:00
commit 954743f55c
15 changed files with 1400 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Engine/source/T3D/gameBase/gameBase.cpp
View file

@ -404,6 +404,12 @@ void GameBase::processTick(const Move * move)
#endif
}
void GameBase::interpolateTick(F32 dt)
{
// PATHSHAPE
updateRenderChangesByParent();
// PATHSHAPE END
}
//----------------------------------------------------------------------------
F32 GameBase::getUpdatePriority(CameraScopeQuery *camInfo, U32 updateMask, S32 updateSkips)
@ -471,14 +477,15 @@ F32 GameBase::getUpdatePriority(CameraScopeQuery *camInfo, U32 updateMask, S32 u
// Weight by updateSkips
F32 wSkips = updateSkips * 0.5;
// Calculate final priority, should total to about 1.0f
// Calculate final priority, should total to about 1.0f (plus children)
//
return
wFov * sUpFov +
wDistance * sUpDistance +
wVelocity * sUpVelocity +
wSkips * sUpSkips +
wInterest * sUpInterest;
wInterest * sUpInterest +
getNumChildren();
}
//----------------------------------------------------------------------------
@ -757,3 +764,44 @@ DefineEngineMethod( GameBase, applyRadialImpulse, void, ( Point3F origin, F32 ra
{
object->applyRadialImpulse( origin, radius, magnitude );
}
// PATHSHAPE
// Console Methods for attach children. can't put them in sceneobject because //
// we want the processafter functions////////////////////////////////////////////
DefineEngineMethod(GameBase, attachChild, bool, (GameBase* _subObject), (nullAsType<GameBase*>()), "(SceneObject subObject)"
"attach an object to this one, preserving its present transform.")
{
if (_subObject != nullptr)
{
if (_subObject->getParent() != object){
Con::errorf("Object is (%d)", _subObject->getId());
_subObject->clearProcessAfter();
_subObject->processAfter(object);
return object->attachChild(_subObject);
}
else
return false;
}
else
{
Con::errorf("Couldn't addObject()!");
return false;
}
}
DefineEngineMethod(GameBase, detachChild, bool, (GameBase* _subObject), (nullAsType<GameBase*>()), "(SceneObject subObject)"
"attach an object to this one, preserving its present transform.")
{
if (_subObject != nullptr)
{
_subObject->clearProcessAfter();
return _subObject->attachToParent(NULL);
}
else
{
return false;
}
}//end
// PATHSHAPE END

2
Engine/source/T3D/gameBase/gameBase.h
View file

@ -356,7 +356,7 @@ public:
/// @name Network
/// @see NetObject, NetConnection
/// @{
void interpolateTick(F32 dt);
F32 getUpdatePriority( CameraScopeQuery *focusObject, U32 updateMask, S32 updateSkips );
U32 packUpdate ( NetConnection *conn, U32 mask, BitStream *stream );
void unpackUpdate( NetConnection *conn, BitStream *stream );