Merge branch 'PostFXReorgAndUpdate' of https://github.com/Areloch/Torque3D into Preview4_0

This commit is contained in:
Areloch 2020-09-11 03:21:56 -05:00
commit b05d5fd3bd
181 changed files with 2487 additions and 1458 deletions

View file

@ -34,6 +34,11 @@ void Scene::initPersistFields()
addGroup("Gameplay");
addField("gameModeName", TypeString, Offset(mGameModeName, Scene), "The name of the gamemode that this scene utilizes");
endGroup("Gameplay");
addGroup("PostFX");
addProtectedField("EditPostEffects", TypeBool, Offset(mEditPostFX, Scene),
&Scene::_editPostEffects, &defaultProtectedGetFn, "Edit Scene's default Post Effects", AbstractClassRep::FieldFlags::FIELD_ComponentInspectors);
endGroup("PostFX");
}
bool Scene::onAdd()
@ -88,6 +93,18 @@ void Scene::onPostAdd()
Con::executef(this, "onPostAdd");
}
bool Scene::_editPostEffects(void* object, const char* index, const char* data)
{
Scene* scene = static_cast<Scene*>(object);
#ifdef TORQUE_TOOLS
if(Con::isFunction("editScenePostEffects"))
Con::executef("editScenePostEffects", scene);
#endif
return false;
}
void Scene::addObject(SimObject* object)
{
//Child scene