TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removes Entity/Component stuff from being behind an experimental flag.

Browse source
This commit is contained in:
Areloch 2017-10-15 06:03:59 -05:00
parent efbd5fb451
commit df9deea1a8
38 changed files with 181 additions and 737 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gui/editor/guiInspector.cpp
View file

@ -29,11 +29,9 @@
#include "gui/containers/guiScrollCtrl.h"
#include "gui/editor/inspector/customField.h"
#ifdef TORQUE_EXPERIMENTAL_EC
#include "gui/editor/inspector/entityGroup.h"
#include "gui/editor/inspector/mountingGroup.h"
#include "gui/editor/inspector/componentGroup.h"
#endif
IMPLEMENT_CONOBJECT(GuiInspector);
@ -589,7 +587,6 @@ void GuiInspector::refresh()
mGroups.push_back(general);
addObject(general);
#ifdef TORQUE_EXPERIMENTAL_EC
//Entity inspector group
if (mTargets.first()->getClassRep()->isSubclassOf("Entity"))
{
@ -624,7 +621,6 @@ void GuiInspector::refresh()
addObject(compGroup);
}
}
#endif
// Create the inspector groups for static fields.

5
Engine/source/gui/editor/inspector/dynamicGroup.cpp
View file

@ -26,9 +26,7 @@
#include "gui/editor/inspector/dynamicField.h"
#include "console/engineAPI.h"
#ifdef TORQUE_EXPERIMENTAL_EC
#include "T3D/components/component.h"
#endif
IMPLEMENT_CONOBJECT(GuiInspectorDynamicGroup);
@ -126,7 +124,6 @@ bool GuiInspectorDynamicGroup::inspectGroup()
SimFieldDictionary * fieldDictionary = target->getFieldDictionary();
for(SimFieldDictionaryIterator ditr(fieldDictionary); *ditr; ++ditr)
{
#ifdef TORQUE_EXPERIMENTAL_EC
if (target->getClassRep()->isSubclassOf("Component"))
{
Component* compTarget = dynamic_cast<Component*>(target);
@ -135,7 +132,7 @@ bool GuiInspectorDynamicGroup::inspectGroup()
if (compField)
continue;
}
#endif
if( i == 0 )
{
flist.increment();