mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-12 19:31:41 +00:00
Updates DecalRoad, MeshRoad and River to be able to write out via persistManager using specialityField functions, similar to ConvexShape
Fixes behavior with gamemode selection in ChooseLevelMenu so if there is only one gamemode, it is auto-selected and advances to the level selection Update ExampleLevel in ExampleModule to have updated gamemodes field name
This commit is contained in:
parent
81ac23fd35
commit
bf9692a451
10 changed files with 192 additions and 42 deletions
|
|
@ -545,6 +545,8 @@ const char* ConvexShape::getSpecialFieldOut(StringTableEntry fieldName, const U3
|
|||
|
||||
return StringTable->insert(buffer);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void ConvexShape::onScaleChanged()
|
||||
|
|
|
|||
|
|
@ -322,7 +322,7 @@ void DecalRoad::initPersistFields()
|
|||
addGroup( "Internal" );
|
||||
|
||||
addProtectedField( "node", TypeString, 0, &addNodeFromField, &emptyStringProtectedGetFn,
|
||||
"Do not modify, for internal use." );
|
||||
"Do not modify, for internal use.", AbstractClassRep::FIELD_HideInInspectors | AbstractClassRep::FIELD_SpecialtyArrayField);
|
||||
|
||||
endGroup( "Internal" );
|
||||
|
||||
|
|
@ -473,6 +473,36 @@ bool DecalRoad::writeField( StringTableEntry fieldname, const char *value )
|
|||
return Parent::writeField( fieldname, value );
|
||||
}
|
||||
|
||||
U32 DecalRoad::getSpecialFieldSize(StringTableEntry fieldName)
|
||||
{
|
||||
if (fieldName == StringTable->insert("node"))
|
||||
{
|
||||
return mNodes.size();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const char* DecalRoad::getSpecialFieldOut(StringTableEntry fieldName, const U32& index)
|
||||
{
|
||||
if (fieldName == StringTable->insert("node"))
|
||||
{
|
||||
if (index >= mNodes.size())
|
||||
return NULL;
|
||||
|
||||
const RoadNode& node = mNodes[index];
|
||||
|
||||
char buffer[1024];
|
||||
dMemset(buffer, 0, 1024);
|
||||
dSprintf(buffer, 1024, "%f %f %f %f", node.point.x, node.point.y, node.point.z, node.width);
|
||||
|
||||
return StringTable->insert(buffer);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
void DecalRoad::onEditorEnable()
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,6 +169,9 @@ public:
|
|||
void onStaticModified(const char* slotName, const char*newValue = NULL) override;
|
||||
void writeFields(Stream &stream, U32 tabStop) override;
|
||||
bool writeField( StringTableEntry fieldname, const char *value ) override;
|
||||
|
||||
U32 getSpecialFieldSize(StringTableEntry fieldName) override;
|
||||
const char* getSpecialFieldOut(StringTableEntry fieldName, const U32& index) override;
|
||||
|
||||
// NetObject
|
||||
U32 packUpdate(NetConnection *, U32, BitStream *) override;
|
||||
|
|
|
|||
|
|
@ -956,10 +956,10 @@ void MeshRoad::initPersistFields()
|
|||
addGroup( "Internal" );
|
||||
|
||||
addProtectedField( "Node", TypeString, 0, &addNodeFromField, &emptyStringProtectedGetFn,
|
||||
"Do not modify, for internal use." );
|
||||
"Do not modify, for internal use.", AbstractClassRep::FIELD_HideInInspectors | AbstractClassRep::FIELD_SpecialtyArrayField);
|
||||
|
||||
addProtectedField( "ProfileNode", TypeString, 0, &addProfileNodeFromField, &emptyStringProtectedGetFn,
|
||||
"Do not modify, for internal use." );
|
||||
"Do not modify, for internal use.", AbstractClassRep::FIELD_HideInInspectors | AbstractClassRep::FIELD_SpecialtyArrayField);
|
||||
|
||||
endGroup( "Internal" );
|
||||
|
||||
|
|
@ -1168,6 +1168,60 @@ bool MeshRoad::writeField( StringTableEntry fieldname, const char *value )
|
|||
return Parent::writeField( fieldname, value );
|
||||
}
|
||||
|
||||
U32 MeshRoad::getSpecialFieldSize(StringTableEntry fieldName)
|
||||
{
|
||||
if (fieldName == StringTable->insert("Node"))
|
||||
{
|
||||
return mNodes.size();
|
||||
}
|
||||
else if (fieldName == StringTable->insert("ProfileNode"))
|
||||
{
|
||||
return mSideProfile.mNodes.size();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const char* MeshRoad::getSpecialFieldOut(StringTableEntry fieldName, const U32& index)
|
||||
{
|
||||
if (fieldName == StringTable->insert("Node"))
|
||||
{
|
||||
if (index >= mNodes.size())
|
||||
return NULL;
|
||||
|
||||
const MeshRoadNode& node = mNodes[index];
|
||||
|
||||
char buffer[1024];
|
||||
dMemset(buffer, 0, 1024);
|
||||
dSprintf(buffer, 1024, "Node = \"%g %g %g %g %g %g %g %g\";", node.point.x, node.point.y, node.point.z, node.width, node.depth, node.normal.x, node.normal.y, node.normal.z);
|
||||
|
||||
return StringTable->insert(buffer);
|
||||
}
|
||||
else if (fieldName == StringTable->insert("ProfileNode"))
|
||||
{
|
||||
Point3F nodePos = mSideProfile.mNodes[index].getPosition();
|
||||
U8 smooth, mtrl;
|
||||
|
||||
if (index)
|
||||
mtrl = mSideProfile.mSegMtrls[index - 1];
|
||||
else
|
||||
mtrl = 0;
|
||||
|
||||
if (mSideProfile.mNodes[index].isSmooth())
|
||||
smooth = 1;
|
||||
else
|
||||
smooth = 0;
|
||||
|
||||
char buffer[1024];
|
||||
dMemset(buffer, 0, 1024);
|
||||
dSprintf(buffer, 1024, "ProfileNode = \"%.6f %.6f %d %d\";", nodePos.x, nodePos.y, smooth, mtrl);
|
||||
|
||||
return StringTable->insert(buffer);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void MeshRoad::onEditorEnable()
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -525,6 +525,9 @@ public:
|
|||
void writeFields(Stream &stream, U32 tabStop) override;
|
||||
bool writeField( StringTableEntry fieldname, const char *value ) override;
|
||||
|
||||
U32 getSpecialFieldSize(StringTableEntry fieldName) override;
|
||||
const char* getSpecialFieldOut(StringTableEntry fieldName, const U32& index) override;
|
||||
|
||||
// NetObject
|
||||
U32 packUpdate(NetConnection *, U32, BitStream *) override;
|
||||
void unpackUpdate(NetConnection *, BitStream *) override;
|
||||
|
|
|
|||
|
|
@ -648,7 +648,8 @@ void River::initPersistFields()
|
|||
|
||||
addGroup( "Internal" );
|
||||
|
||||
addProtectedField( "Node", TypeString, 0, &addNodeFromField, &emptyStringProtectedGetFn, "For internal use, do not modify." );
|
||||
addProtectedField( "Node", TypeString, 0, &addNodeFromField, &emptyStringProtectedGetFn, "For internal use, do not modify.",
|
||||
AbstractClassRep::FIELD_HideInInspectors | AbstractClassRep::FIELD_SpecialtyArrayField);
|
||||
|
||||
endGroup( "Internal" );
|
||||
|
||||
|
|
@ -785,6 +786,38 @@ bool River::writeField( StringTableEntry fieldname, const char *value )
|
|||
return Parent::writeField( fieldname, value );
|
||||
}
|
||||
|
||||
U32 River::getSpecialFieldSize(StringTableEntry fieldName)
|
||||
{
|
||||
if (fieldName == StringTable->insert("node"))
|
||||
{
|
||||
return mNodes.size();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
const char* River::getSpecialFieldOut(StringTableEntry fieldName, const U32& index)
|
||||
{
|
||||
if (fieldName == StringTable->insert("node"))
|
||||
{
|
||||
if (index >= mNodes.size())
|
||||
return NULL;
|
||||
|
||||
const RiverNode& node = mNodes[index];
|
||||
|
||||
char buffer[1024];
|
||||
dMemset(buffer, 0, 1024);
|
||||
dSprintf(buffer, 1024, "Node = \"%f %f %f %f %f %f %f %f\";", node.point.x, node.point.y, node.point.z,
|
||||
node.width,
|
||||
node.depth,
|
||||
node.normal.x, node.normal.y, node.normal.z);
|
||||
|
||||
return StringTable->insert(buffer);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void River::innerRender( SceneRenderState *state )
|
||||
{
|
||||
GFXDEBUGEVENT_SCOPE( River_innerRender, ColorI( 255, 0, 0 ) );
|
||||
|
|
|
|||
|
|
@ -394,6 +394,9 @@ public:
|
|||
void writeFields(Stream &stream, U32 tabStop) override;
|
||||
bool writeField( StringTableEntry fieldname, const char *value ) override;
|
||||
|
||||
U32 getSpecialFieldSize(StringTableEntry fieldName) override;
|
||||
const char* getSpecialFieldOut(StringTableEntry fieldName, const U32& index) override;
|
||||
|
||||
// NetObject
|
||||
U32 packUpdate(NetConnection *, U32, BitStream *) override;
|
||||
void unpackUpdate(NetConnection *, BitStream *) override;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue