Skip to content
This repository has been archived by the owner on Oct 4, 2022. It is now read-only.

PopcornFX dynamic lights #495

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

PopcornFX dynamic lights #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f75d6f
Add and expose RegisterVolumeForLighting function
ValPKFX Jun 9, 2020
8e96793
Add missed mock for RegisterVolumeForLighting to fix unit tests
ValPKFX Jun 12, 2020
d1a5edc
Merge branch '1.25' into popcornfx_dynamic_lights
ValPKFX Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dev/Code/CryEngine/Cry3DEngine/3DEngineLight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,11 @@ void C3DEngine::GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, u
m_LightVolumesMgr.GetLightVolumes(nThreadID, pLightVols, nNumVols);
}

uint16 C3DEngine::RegisterVolumeForLighting(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo)
{
return m_LightVolumesMgr.RegisterVolume(vPos, fRadius, nClipVolumeRef, passInfo);
}

//////////////////////////////////////////////////////////////////////////
#ifndef _RELEASE
void CLightVolumesMgr::DrawDebug(const SRenderingPassInfo& passInfo)
Expand Down
2 changes: 2 additions & 0 deletions dev/Code/CryEngine/Cry3DEngine/3dEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,6 +1243,8 @@ class C3DEngine
///////////////////////////////////////////////////////////////////////////////

virtual void GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols);
virtual uint16 RegisterVolumeForLighting(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo);

CLightVolumesMgr m_LightVolumesMgr;

///////////////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 6 additions & 0 deletions dev/Code/CryEngine/CryCommon/I3DEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,6 +2463,12 @@ struct I3DEngine
// An array holding all the SLightVolume pointers.
virtual void GetLightVolumes(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols) = 0;

// Summary:
// Registers a volume for lighting
// Return Value:
// The index of the registered volume.
virtual uint16 RegisterVolumeForLighting(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo) = 0;

// Summary:
// Reload the heightmap.
// Description:
Expand Down
2 changes: 2 additions & 0 deletions dev/Code/CryEngine/CryCommon/Mocks/I3DEngineMock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@ class I3DEngineMock
const PodArray<ILightSource*>* ());
MOCK_METHOD3(GetLightVolumes,
void(threadID nThreadID, SLightVolume*& pLightVols, uint32& nNumVols));
MOCK_METHOD4(RegisterVolumeForLighting,
uint16(const Vec3& vPos, f32 fRadius, uint8 nClipVolumeRef, const SRenderingPassInfo& passInfo));
MOCK_METHOD1(RestoreTerrainFromDisk,
bool(int));
MOCK_METHOD1(GetFilePath,
Expand Down