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

Merge branch 'item-networking' of https://github.com/eightyeight/Torque3D into eightyeight-item-networking

Browse source
This commit is contained in:
David Wyand 2012-10-01 11:25:17 -04:00
commit d38eb17056
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/source/T3D/item.cpp
View file

@ -1276,11 +1276,26 @@ DefineEngineMethod( Item, getLastStickyNormal, const char *, (),,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool Item::_setStatic(void *object, const char *index, const char *data)
{
Item *i = static_cast<Item*>(object);
i->mAtRest = dAtob(data);
i->setMaskBits(InitialUpdateMask | PositionMask);
return true;
}
bool Item::_setRotate(void *object, const char *index, const char *data)
{
Item *i = static_cast<Item*>(object);
i->setMaskBits(InitialUpdateMask | RotationMask);
return true;
}
void Item::initPersistFields() void Item::initPersistFields()
{ {
addGroup("Misc"); addGroup("Misc");
addField("static", TypeBool, Offset(mStatic, Item), "If true, the object is not moving in the world (and will not be updated through the network).\n"); addProtectedField("static", TypeBool, Offset(mStatic, Item), &_setStatic, &defaultProtectedGetFn, "If true, the object is not moving in the world.\n");
addField("rotate", TypeBool, Offset(mRotate, Item), "If true, the object will automatically rotate around its Z axis.\n"); addProtectedField("rotate", TypeBool, Offset(mRotate, Item), &_setRotate, &defaultProtectedGetFn, "If true, the object will automatically rotate around its Z axis.\n");
endGroup("Misc"); endGroup("Misc");
Parent::initPersistFields(); Parent::initPersistFields();

3
Engine/source/T3D/item.h
View file

@ -150,6 +150,9 @@ class Item: public ShapeBase
void buildConvex(const Box3F& box, Convex* convex); void buildConvex(const Box3F& box, Convex* convex);
void onDeleteNotify(SimObject*); void onDeleteNotify(SimObject*);
static bool _setStatic(void *object, const char *index, const char *data);
static bool _setRotate(void *object, const char *index, const char *data);
protected: protected:
void _updatePhysics(); void _updatePhysics();
void prepRenderImage(SceneRenderState *state); void prepRenderImage(SceneRenderState *state);