Red code legacy renderer (#383)
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null. - Restore the debug console to existence. - Stop building the following in preparation for their removal: Code/CryEngine/Cry3DEngine/* Code/CryEngine/RenderDll/* Code/Tools/CryFXC/* Code/Tools/HLSLCrossCompiler/* Code/Tools/HLSLCrossCompilerMETAL/* Code/Tools/RC/* Code/Tools/ShaderCacheGen/* Tools/CrySCompileServer/*
This commit is contained in:
@@ -27,6 +27,7 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
|
||||
#define MIN_RES 64
|
||||
#define MAX_RES 8192
|
||||
|
||||
CCustomResolutionDlg::CCustomResolutionDlg(int w, int h, QWidget* pParent /*=NULL*/)
|
||||
: QDialog(pParent)
|
||||
@@ -46,18 +47,17 @@ CCustomResolutionDlg::~CCustomResolutionDlg()
|
||||
|
||||
void CCustomResolutionDlg::OnInitDialog()
|
||||
{
|
||||
int maxRes = GetIEditor()->GetRenderer()->GetMaxSquareRasterDimension();
|
||||
m_ui->m_width->setRange(MIN_RES, maxRes);
|
||||
m_ui->m_width->setRange(MIN_RES, MAX_RES);
|
||||
m_ui->m_width->setValue(m_wDefault);
|
||||
|
||||
m_ui->m_height->setRange(MIN_RES, maxRes);
|
||||
m_ui->m_height->setRange(MIN_RES, MAX_RES);
|
||||
m_ui->m_height->setValue(m_hDefault);
|
||||
|
||||
QString maxDimensionString;
|
||||
QTextStream(&maxDimensionString)
|
||||
<< "Maximum Dimension: " << maxRes << Qt::endl
|
||||
<< "Maximum Dimension: " << MAX_RES << Qt::endl
|
||||
<< Qt::endl
|
||||
<< "Note: Dimensions over 4K may be" << Qt::endl
|
||||
<< "Note: Dimensions over 8K may be" << Qt::endl
|
||||
<< "unstable depending on hardware.";
|
||||
|
||||
m_ui->m_maxDimension->setText(maxDimensionString);
|
||||
|
||||
@@ -19,10 +19,6 @@
|
||||
#include "GameEngine.h"
|
||||
#include "CryEditDoc.h"
|
||||
|
||||
// Cry3DEngine
|
||||
#include <Cry3DEngine/Environment/OceanEnvironmentBus.h>
|
||||
|
||||
|
||||
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
#include <ui_EnvironmentPanel.h>
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
@@ -36,15 +32,6 @@ CEnvironmentPanel::CEnvironmentPanel(QWidget* pParent /*=nullptr*/)
|
||||
{
|
||||
XmlNodeRef node = GetIEditor()->GetDocument()->GetEnvironmentTemplate();
|
||||
|
||||
// is the feature toggle enabled?
|
||||
bool bHasOceanFeature = false;
|
||||
AZ::OceanFeatureToggleBus::BroadcastResult(bHasOceanFeature, &AZ::OceanFeatureToggleBus::Events::OceanComponentEnabled);
|
||||
if (bHasOceanFeature)
|
||||
{
|
||||
node->findChild("Ocean")->setAttr("hidden", true);
|
||||
node->findChild("OceanAnimation")->setAttr("hidden", true);
|
||||
}
|
||||
|
||||
m_onSetCallback = AZStd::bind(&CCryEditDoc::OnEnvironmentPropertyChanged, GetIEditor()->GetDocument(), AZStd::placeholders::_1);
|
||||
|
||||
ui->setupUi(this);
|
||||
|
||||
@@ -8,8 +8,3 @@
|
||||
# remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
#
|
||||
|
||||
set(LY_BUILD_DEPENDENCIES
|
||||
PRIVATE
|
||||
Legacy::CryRenderNULL
|
||||
)
|
||||
@@ -275,8 +275,6 @@ void CRenderViewport::resizeEvent(QResizeEvent* event)
|
||||
|
||||
gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_RESIZE, width(), height());
|
||||
|
||||
gEnv->pRenderer->EF_DisableTemporalEffects();
|
||||
|
||||
if (AZ::Interface<AzFramework::AtomActiveInterface>::Get())
|
||||
{
|
||||
// We queue the window resize event because the render overlay may be hidden.
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
#include "Undo/Undo.h"
|
||||
#include "LyViewPaneNames.h"
|
||||
|
||||
// Cry3DEngine
|
||||
#include <Cry3DEngine/Environment/OceanEnvironmentBus.h>
|
||||
|
||||
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
#include <ui_TimeOfDayDialog.h>
|
||||
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
|
||||
@@ -69,14 +66,6 @@ namespace TimeOfDayDetails
|
||||
return static_cast<float>(time.msecsSinceStartOfDay() / 60000) / 60.0;
|
||||
}
|
||||
|
||||
// Is the ocean component feature toggle enabled?
|
||||
AZ_INLINE static bool HasOceanFeatureToggle()
|
||||
{
|
||||
bool bHasOceanFeature = false;
|
||||
AZ::OceanFeatureToggleBus::BroadcastResult(bHasOceanFeature, &AZ::OceanFeatureToggleBus::Events::OceanComponentEnabled);
|
||||
return bHasOceanFeature;
|
||||
}
|
||||
|
||||
AZ_INLINE static bool SkipUserInterface(int value)
|
||||
{
|
||||
// Check for obsolete parameters that we still want to keep around to migrate legacy data to new data
|
||||
@@ -89,13 +78,6 @@ namespace TimeOfDayDetails
|
||||
(enumValue == ITimeOfDay::PARAM_TERRAIN_OCCL_MULTIPLIER) ||
|
||||
(enumValue == ITimeOfDay::PARAM_SUN_COLOR_MULTIPLIER);
|
||||
|
||||
// Only check the ocean parameters if the ocean feature (aka the Infinite Ocean Component)
|
||||
// has been enabled
|
||||
skipParameter |= HasOceanFeatureToggle() &&
|
||||
((enumValue == ITimeOfDay::PARAM_OCEANFOG_COLOR) ||
|
||||
(enumValue == ITimeOfDay::PARAM_OCEANFOG_COLOR_MULTIPLIER) ||
|
||||
(enumValue == ITimeOfDay::PARAM_OCEANFOG_DENSITY));
|
||||
|
||||
return skipParameter;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user