@@ -3,4 +3,4 @@ SDKs
#ColinB (8/26)- I know there are depot files that this will ignore... But these files should not be
#here, they should all be in 3rdParty... so we will ignore them until I can move them, it should
-#be OK for now because they shouldn't change at all anyway.
+#be OK for now because they shouldn't change at all anyway.
@@ -396,4 +396,4 @@ void CFogVolumeRenderNode::GetVolumetricFogColorBox(const Vec3& worldPos, const
resultColor = ColorF(m_cachedFogColor.r, m_cachedFogColor.g, m_cachedFogColor.b, min(fog, 1.0f));
}
-}
+}
@@ -325,4 +325,4 @@ bool CGeomCacheMeshManager::ReadMeshColors(CGeomCacheStreamReader& reader, const
return true;
-#endif
+#endif
@@ -1488,4 +1488,4 @@ void CGeomCacheRenderNode::OnGeomCacheStaticDataUnloaded()
Clear(false);
@@ -14,4 +14,4 @@
// Description : Draw static objects (vegetations)
-#include "Cry3DEngine_precompiled.h"
+#include "Cry3DEngine_precompiled.h"
@@ -94,4 +94,4 @@ void C3DEngine::DisablePostEffects()
@@ -22,4 +22,4 @@ TEST(MockValidationTests, SystemMock_Compiles)
TEST(MockValidationTests, LogMock_Compiles)
{
LogMock mockLog;
@@ -71,4 +71,4 @@ namespace std17
-#endif // CRYINCLUDE_CRYCOMMON_ALGORITHM_H
+#endif // CRYINCLUDE_CRYCOMMON_ALGORITHM_H
@@ -318,4 +318,4 @@ namespace Bezier
@@ -63,4 +63,4 @@ public:
};
-#endif // #ifndef _CREFOGVOLUME_
+#endif // #ifndef _CREFOGVOLUME_
@@ -67,4 +67,4 @@ public:
_smart_ptr<IRenderMesh> m_pHullMesh;
-#endif // #ifndef _CREVOLUMEOBJECT_
+#endif // #ifndef _CREVOLUMEOBJECT_
@@ -54,4 +54,4 @@ private:
@@ -35,4 +35,4 @@ namespace AZ
typedef AZ::EBus<HeightmapUpdateNotification> HeightmapUpdateNotificationBus;
@@ -83,4 +83,4 @@ void LocalizationManagerRequests::LocalizeAndSubstitute(const AZStd::string& loc
outLocalizedString = locString;
LocalizationManagerRequestBus::Broadcast(&LocalizationManagerRequestBus::Events::LocalizeAndSubstituteInternal, outLocalizedString, keys, values);
@@ -96,4 +96,4 @@ public: // member functions
virtual void OnCheckboxStateChange([[maybe_unused]] bool checked) {}
-typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
+typedef AZ::EBus<UiCheckboxNotifications> UiCheckboxNotificationBus;
@@ -124,4 +124,4 @@ public: // member functions
virtual void OnDropdownValueChanged([[maybe_unused]] AZ::EntityId option) {}
-typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
+typedef AZ::EBus<UiDropdownNotifications> UiDropdownNotificationBus;
@@ -63,4 +63,4 @@ public: // member functions
virtual void OnDropdownOptionSelected() {}
-typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
+typedef AZ::EBus<UiDropdownOptionNotifications> UiDropdownOptionNotificationBus;
@@ -83,4 +83,4 @@ public: // member functions
virtual void OnRadioButtonStateChange([[maybe_unused]] bool checked) {}
-typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
+typedef AZ::EBus<UiRadioButtonNotifications> UiRadioButtonNotificationBus;
@@ -38,4 +38,4 @@ public: // static member data
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Single;
-typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
+typedef AZ::EBus<UiRadioButtonCommunicationInterface> UiRadioButtonCommunicationBus;
@@ -75,4 +75,4 @@ public: // member functions
virtual void OnRadioButtonGroupStateChange([[maybe_unused]] AZ::EntityId checkedRadioButton) {}
-typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
+typedef AZ::EBus<UiRadioButtonGroupNotifications> UiRadioButtonGroupNotificationBus;
@@ -44,4 +44,4 @@ public: // static member data
-typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
+typedef AZ::EBus<UiRadioButtonGroupCommunicationInterface> UiRadioButtonGroupCommunicationBus;
@@ -107,4 +107,4 @@ public: // member functions
virtual void OnSliderValueChanged([[maybe_unused]] float value) {}
-typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
+typedef AZ::EBus<UiSliderNotifications> UiSliderNotificationBus;
@@ -57,4 +57,4 @@ namespace Maestro
// defined in the bus header so we can refer to it in the Editor code
#define EditorSequenceComponentTypeId "{C02DC0E2-D0F3-488B-B9EE-98E28077EC56}"
-} // namespace Maestro
+} // namespace Maestro
@@ -97,4 +97,4 @@ namespace AZStd
return retVal;
@@ -52,4 +52,4 @@ enum class AnimNodeType
Num
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMNODETYPE_H
@@ -42,4 +42,4 @@ enum class AnimValue
-#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
+#endif CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUE_H
@@ -45,4 +45,4 @@ enum class AnimValueType
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_ANIMVALUETYPE_H
@@ -35,4 +35,4 @@ struct IAssetBlendKey
AZ_TYPE_INFO_SPECIALIZE(IAssetBlendKey, "{15B82C3A-6DB8-466F-AF7F-18298FCD25FD}");
@@ -77,4 +77,4 @@ namespace Maestro
@@ -25,4 +25,4 @@ enum class SequenceType
SequenceComponent = 1 // Sequence Component on an AZ::Entity
-#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
+#endif // CRYINCLUDE_CRYCOMMON_MAESTRO_TYPES_SEQUENCETYPE_H
@@ -110,4 +110,4 @@ private:
CTimeValue m_frameStartTime;
float m_frameTime;
float m_frameRate;
-};
+};
@@ -12,4 +12,4 @@
set(FILES
../../EngineSettingsBackendApple.cpp
../../EngineSettingsBackendApple.h
-)
+)
../../EngineSettingsBackendWin32.cpp
../../EngineSettingsBackendWin32.h
@@ -10,4 +10,4 @@
#
@@ -120,4 +120,4 @@ namespace AZ
using RenderScreenshotNotificationBus = AZ::EBus<RenderScreenshotNotifications>;
@@ -83,4 +83,4 @@ namespace AzRTT
//! confirm if user wants to use texture size larger than MaxRecommendedRenderTargetSize
bool ValidateTextureSize(void* newValue, const AZ::Uuid& valueType);
@@ -64,4 +64,4 @@ namespace Serialization
using Serialization::ForceFeedbackIdName;
-#endif // CRYINCLUDE_CRYCOMMON_SERIALIZATION_DECORATORS_RESOURCES_H
+#endif // CRYINCLUDE_CRYCOMMON_SERIALIZATION_DECORATORS_RESOURCES_H
@@ -24,4 +24,4 @@ namespace Serialization
@@ -44,4 +44,4 @@ namespace AZ
using StereoRendererRequestBus = EBus < StereoRendererBus >;
@@ -85,4 +85,4 @@ public:
PodArray<T*> m_lstUsed;
T* m_pPool;
int m_nPoolSize;
@@ -256,4 +256,4 @@ namespace AZ
}//namespace VR
AZ_TYPE_INFO_SPECIALIZE(VR::ControllerIndex, "{90D4C80E-A1CC-4DBF-A131-0082C75835E8}");
-}//namespace AZ
+}//namespace AZ
@@ -24,4 +24,4 @@ set(FILES
# Remove files that cause #define collisions on Mac due to multiple inclusions of 'AppleSpecific.h' and include orders
set(SKIP_UNITY_BUILD_INCLUSION_FILES
SettingsManagerHelpers.cpp
@@ -23,4 +23,4 @@ set(FILES
Mocks/ITextureMock.h
Mocks/IRemoteConsoleMock.h
Mocks/MockCGFContent.h
@@ -1,3 +1,3 @@
EXPORTS
ModuleInitISystem @2
- CryModuleGetMemoryInfo @8
+ CryModuleGetMemoryInfo @8
@@ -464,4 +464,4 @@ static void printModel(const HuffmanTreeNode* const pNodes, const HuffmanSymbolC
printf("\n");
-}*/
+}*/
@@ -91,4 +91,4 @@ void CIOSConsole::PutText( int x, int y, const char * msg )
void CIOSConsole::EndDraw() {
// Do Nothing
-#endif // IOS
+#endif // IOS
@@ -26,4 +26,4 @@ bool CLZ4Decompressor::DecompressData(const char* pIn, char* pOut, const uint ou
void CLZ4Decompressor::Release()
delete this;
@@ -313,4 +313,4 @@ bool CMiniButton::SetConnectedCtrl(IMiniCtrl* pConnectedCtrl)
-MINIGUI_END
+MINIGUI_END
@@ -171,4 +171,4 @@ void CMiniInfoBox::AutoResize()
m_requiresResize = false;
@@ -361,4 +361,4 @@ void CMiniMenu::AddSubCtrl(IMiniCtrl* pCtrl)
// Call parent
CMiniButton::AddSubCtrl(pCtrl);
@@ -182,4 +182,4 @@ void CRemoteConsole::RegisterListener(IRemoteConsoleListener* pListener, const c
void CRemoteConsole::UnregisterListener(IRemoteConsoleListener* pListener)
m_listener.Remove(pListener);
@@ -284,4 +284,4 @@ void CSampler::LogSampledData()
-#endif // defined(WIN32)
+#endif // defined(WIN32)
@@ -356,4 +356,4 @@ void DebugCamera::MovePosition(const Vec3& offset)
m_position += m_view.GetColumn2() * offset.z;
-} // namespace LegacyViewSystem
+} // namespace LegacyViewSystem
@@ -80,4 +80,4 @@ inline bool DebugCamera::IsFree()
return m_cameraMode == DebugCamera::ModeFree;
@@ -39,4 +39,4 @@ private:
static void SphereTessR(Vec3& v0, Vec3& v1, Vec3& v2, int depth, t_arrDeferredMeshIndBuff& indBuff, t_arrDeferredMeshVertBuff& vertBuff);
@@ -90,4 +90,4 @@ namespace Render
} // namespace Render
#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_MEMORY_VRAMDRILLERBUS_H
-#pragma once
+#pragma once
@@ -685,4 +685,4 @@ Matrix44& SPostEffectsUtils::GetColorMatrix()
return m_pColorMat;
-////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -309,4 +309,4 @@ private:
static CTexture* m_UpscaleTarget;
-#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
+#endif // CRYINCLUDE_CRYENGINE_RENDERDLL_COMMON_POSTPROCESS_POSTPROCESSUTILS_H
@@ -71,4 +71,4 @@ void AbstractMeshElement::DrawMeshWireframe()
gcpRendD3D->FX_DrawIndexedPrimitive(eptTriangleList, 0, 0, nVertexBufferCount, 0, nIndexBufferCount);
gcpRendD3D->FX_SetState(nState);
@@ -47,4 +47,4 @@ void CREDeferredShading::mfReset()
void CREDeferredShading::mfActivate([[maybe_unused]] int iProcess)
@@ -240,4 +240,4 @@ bool CREGeomCache::GetGeometryInfo(SGeometryInfo &streams)
@@ -47,4 +47,4 @@ void CREHDRProcess::mfReset()
void CREHDRProcess::mfActivate([[maybe_unused]] int iProcess)
@@ -58,4 +58,4 @@ IOpticsElementBase* COpticsFactory::Create(EFlareType type) const
default:
return NULL;
@@ -74,4 +74,4 @@ public:
static OpticsPredef instance;
return &instance;
@@ -850,4 +850,4 @@ EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, con
return state;
-}//-------------------------------------------------------------------------------------------------
+}//-------------------------------------------------------------------------------------------------
@@ -150,4 +150,4 @@ enum EPolygonInCircle2D
EPolygonInCircle2D PolygonInCircle2D(const Vec2& center, const float radius, const Vec2* pPolygon, const int numPts);
-#endif // _POLYGON_MATH_2D_
+#endif // _POLYGON_MATH_2D_
@@ -285,4 +285,4 @@ void CSpatialHashGrid<T, GridSize, BucketSize>::DebugDraw()
#endif // !RELEASE
#endif // GLASSCFG_USE_HASH_GRID
-#endif // _SPATIAL_HASH_GRID_
+#endif // _SPATIAL_HASH_GRID_
@@ -19,4 +19,4 @@ FX_STATIC_FLAG(GMEM_RT_GREATER_FOUR)
FX_STATIC_FLAG(NO_DEPTH_CLIPPING)
FX_STATIC_FLAG(FEATURE_FETCH_DEPTHSTENCIL)
FX_STATIC_FLAG(GMEM_VELOCITY_BUFFER)
-FX_STATIC_FLAG(GLES3_0)
+FX_STATIC_FLAG(GLES3_0)
@@ -51,4 +51,4 @@ struct PerFrameParameters
Vec4 m_VolumetricFogDistanceParams;
-#endif // _PER_FRAME_RESOURCE_GROUP_
+#endif // _PER_FRAME_RESOURCE_GROUP_
@@ -228,4 +228,4 @@ void CPowerOf2BlockPacker::FreeContainers()
Clear();
stl::free_container(m_Blocks);
stl::free_container(m_BlockBitmap);
@@ -43,4 +43,4 @@ void CStereoTexture::Apply(int nTUnit, int nState, int nTexMatSlot, int nSUnit,
AZ_Assert(true, "Invalid eye provided for rendering");
@@ -37,4 +37,4 @@ public:
void Apply(int nTUnit, int nState = -1, int nTexMatSlot = EFTT_UNKNOWN, int nSUnit = -1, SResourceView::KeyType nResViewKey = SResourceView::DefaultView, EHWShaderClass eHWSC = eHWSC_Pixel) override;
AZStd::vector<CTexture*> m_textures;
// Original file Copyright Crytek GMBH or its affiliates, used under license.
#include "RenderDll_precompiled.h"
-
+
@@ -198,4 +198,4 @@ bool CRELensOptics::mfDraw(CShader* pShader, [[maybe_unused]] SShaderPass* pass)
void CRELensOptics::ClearResources()
g_SoftOcclusionManager.ClearResources();
</Link>
</ItemDefinitionGroup>
<ItemGroup />
-</Project>
+</Project>
@@ -116,4 +116,4 @@ class D3DHMDRenderer
EyeRenderTarget m_eyes[STEREO_EYE_COUNT]; ///< Device render targets to be rendered to and submitted to the HMD for display.
bool m_framePrepared; ///< If true, PrepareFrame() and SubmitFrame() were called in the proper ordering (just for debugging purproses).
@@ -53,4 +53,4 @@ namespace RenderCapabilities
@@ -11,4 +11,4 @@
*/
-#include "RenderDll_precompiled.h"
+#include "RenderDll_precompiled.h"
@@ -43,4 +43,4 @@
# include <glad/glx.h>
# undef GLAD_GLX_IMPLEMENTATION
# endif
@@ -40,4 +40,4 @@ namespace NCryOpenGL
"{"
" Output0 = texture(text0, VtxOutput0.xy);"
"}";
@@ -352,4 +352,4 @@ namespace NCryOpenGL
-#endif //__GLFORMAT__
+#endif //__GLFORMAT__
@@ -1112,4 +1112,4 @@ CUSTOM_INSTRUMENT(Delete, glDeleteSamplers)
CUSTOM_INSTRUMENT(Delete, glDeleteTransformFeedbacks)
CUSTOM_INSTRUMENT(Delete, glDeleteProgramPipelines)
-#endif //__GLINSTRUMENT__
+#endif //__GLINSTRUMENT__
@@ -51,4 +51,4 @@ bool CCryDXGLBlendState::Apply(NCryOpenGL::CContext* pContext)
void CCryDXGLBlendState::GetDesc(D3D11_BLEND_DESC* pDesc)
(*pDesc) = m_kDesc;
@@ -75,4 +75,4 @@ LPVOID CCryDXGLBlob::GetBufferPointer()
SIZE_T CCryDXGLBlob::GetBufferSize()
return m_uBufferSize;
@@ -41,4 +41,4 @@ private:
D3D11_BUFFER_DESC m_kDesc;
-#endif //__CRYDXGLBUFFER__
+#endif //__CRYDXGLBUFFER__
@@ -50,4 +50,4 @@ bool CCryDXGLDepthStencilState::Apply(uint32 uStencilReference, NCryOpenGL::CCon
void CCryDXGLDepthStencilState::GetDesc(D3D11_DEPTH_STENCIL_DESC* pDesc)
@@ -53,4 +53,4 @@ NCryOpenGL::SOutputMergerView* CCryDXGLDepthStencilView::GetGLView()
void CCryDXGLDepthStencilView::GetDesc(D3D11_DEPTH_STENCIL_VIEW_DESC* pDesc)
*pDesc = m_kDesc;
@@ -44,4 +44,4 @@ protected:
_smart_ptr<NCryOpenGL::SOutputMergerView> m_spGLView;
-#endif //__CRYDXGLDEPTHSTENCILVIEW__
+#endif //__CRYDXGLDEPTHSTENCILVIEW__
@@ -53,4 +53,4 @@ HRESULT CCryDXGLGIObject::GetParent(REFIID riid, void** ppParent)
DXGL_TODO("Implement if required")
* ppParent = NULL;
return E_FAIL;
@@ -331,4 +331,4 @@ HRESULT CCryDXGLGIOutput::GetFrameStatistics(DXGI_FRAME_STATISTICS* pStats)
DXGL_NOT_IMPLEMENTED
@@ -57,4 +57,4 @@ protected:
DXGI_OUTPUT_DESC m_kDesc;
-#endif //__CRYDXGLGIOUTPUT__
+#endif //__CRYDXGLGIOUTPUT__
@@ -34,4 +34,4 @@ CCryDXGLInputLayout::~CCryDXGLInputLayout()
NCryOpenGL::SInputLayout* CCryDXGLInputLayout::GetGLLayout()
return m_spGLLayout;
@@ -38,4 +38,4 @@ private:
_smart_ptr<NCryOpenGL::SInputLayout> m_spGLLayout;
-#endif //__CRYDXGLINPUTLAYOUT__
+#endif //__CRYDXGLINPUTLAYOUT__
@@ -55,4 +55,4 @@ UINT CCryDXGLQuery::GetDataSize(void)
void CCryDXGLQuery::GetDesc(D3D11_QUERY_DESC* pDesc)
@@ -59,4 +59,4 @@ private:
_smart_ptr<NCryOpenGL::SQuery> m_spGLQuery;
-#endif //__CRYDXGLQUERY__
+#endif //__CRYDXGLQUERY__
NCryOpenGL::SRasterizerState* m_pGLState;
-#endif //__CRYDXGLRASTERIZERSTATE__
+#endif //__CRYDXGLRASTERIZERSTATE__