Improve light source testing on sectors and portals

v2v3v4 · v2v3v4 · commit 5935880f5dbd · 2026-01-19T13:32:50.000+03:00
diff --git a/src/Layers/xrRender/light.cpp b/src/Layers/xrRender/light.cpp
@@ -196,7 +196,7 @@ void	light::set_rotation		(const Fvector& D, const Fvector& R)	{
 #if RENDER!=R_R1
 void light::get_sectors()
 {
-	if(RImplementation.SectorsCount()<=1) return;
+	if(RImplementation.SectorsCount()<=1 || SpatialComponent.get() == nullptr) return;
 	xrCriticalSectionGuard guard(&sectors_lc);
 	if(0== SpatialComponent->spatial.sector)
 		SpatialComponent->spatial_updatesector();
@@ -206,14 +206,14 @@ void light::get_sectors()
 
 	if(flags.type == IRender_Light::SPOT || flags.type == IRender_Light::OMNIPART)
 	{
-		CFrustum temp = CFrustum();
-		temp.CreateFromMatrix			(X.S.combine, FRUSTUM_P_ALL);
+		CFrustum temp;
+		temp.CreateFromMatrix(X.S.combine, FRUSTUM_P_ALL);
 
-		m_sectors = std::move(RImplementation.detectSectors_frustum(sector, &temp));
+		RImplementation.detectSectors_frustum(sector, m_sectors, &temp);
 	}
-	if(flags.type == IRender_Light::POINT)
+	else if(flags.type == IRender_Light::POINT)
 	{
-		m_sectors = std::move(RImplementation.detectSectors_sphere(sector, position, Fvector().set(range, range, range)));
+		RImplementation.detectSectors_sphere(sector, m_sectors, { position, range });
 	}
 }
 
@@ -223,6 +223,9 @@ bool light::has_light_visible_from_sectors()
 	xrCriticalSectionGuard guard(&sectors_lc);
 	for (IRender_Sector* IRsector : m_sectors)
 	{
+		if (IRsector == nullptr)
+			continue;
+
 		CSector* sector_ = (CSector*)IRsector;
 		if (sector_ != nullptr && PortalTraverser.i_marker == sector_->r_marker)
 		{
diff --git a/src/Layers/xrRender/r__dsgraph_structure.h b/src/Layers/xrRender/r__dsgraph_structure.h
@@ -29,7 +29,7 @@ class	R_dsgraph_structure										: public IRender_interface, public pureFrame
 	R_feedback*													val_feedback;		// feedback for geometry being rendered
 	u32															val_feedback_breakp;// breakpoint
 
-	u32															phase;
+
 	u32															marker;
 	bool														pmask[3];
 public:
@@ -142,6 +142,9 @@ class	R_dsgraph_structure										: public IRender_interface, public pureFrame
 	void		r_dsgraph_render_R1_box							(IRender_Sector* _sector, Fbox& _bb, int _element);
 
 
+	void detectSectors_sphere(CSector* sector, xr_vector<IRender_Sector*>& m_sectors, const Fsphere& sphere);
+	void detectSectors_frustum(CSector* sector, xr_vector<IRender_Sector*>& m_sectors, CFrustum* _frustum);
+
 public:
 	virtual		u32						memory_usage			()
 	{
diff --git a/src/Layers/xrRender/r__sector_detect.cpp b/src/Layers/xrRender/r__sector_detect.cpp
@@ -141,17 +141,19 @@ IRender_Sector* CRender::detectSector(const Fvector& P, Fvector& dir)
 	}
 }
 
-xr_vector<IRender_Sector*> CRender::detectSectors_sphere(CSector* sector, const Fvector& b_center, const Fvector& b_dim)
+void R_dsgraph_structure::detectSectors_sphere(CSector* sector, xr_vector<IRender_Sector*>& m_sectors, const Fsphere& sphere)
 {
-	xr_vector<IRender_Sector*> m_sectors;
-	m_sectors.push_back(sector);
-	if (rmPortals)
+	if(sector)
+		m_sectors.push_back(sector);
+
+	if (CDB::MODEL* portals_cform = RImplementation.rmPortals)
 	{
 		sectors_detect_xrc.box_options(CDB::OPT_FULL_TEST);
-		sectors_detect_xrc.box_query(rmPortals,b_center,b_dim);
+		float sphere_r = sphere.R;
+		sectors_detect_xrc.box_query(portals_cform, sphere.P, { sphere_r, sphere_r, sphere_r });
 		for (int K=0; K< sectors_detect_xrc.r_count(); K++)
 		{
-			CPortal* pPortal = (CPortal*) Portals[rmPortals->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];
+			CPortal* pPortal = (CPortal*)RImplementation.Portals[portals_cform->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];
 
 			if(!pPortal)
 				continue;
@@ -166,20 +168,20 @@ xr_vector<IRender_Sector*> CRender::detectSectors_sphere(CSector* sector, const
 				m_sectors.push_back(pBack);
 		}
 	}
-	return m_sectors;
 }
 
-xr_vector<IRender_Sector*> CRender::detectSectors_frustum(CSector* sector, CFrustum* _frustum)
+void R_dsgraph_structure::detectSectors_frustum(CSector* sector, xr_vector<IRender_Sector*>& m_sectors, CFrustum* _frustum)
 {
-	xr_vector<IRender_Sector*> m_sectors;
-	m_sectors.push_back(sector);
-	if (rmPortals)
+	if(sector)
+		m_sectors.push_back(sector);
+	
+	if (CDB::MODEL* portals_cform = RImplementation.rmPortals)
 	{
 		sectors_detect_xrc.frustum_options(CDB::OPT_FULL_TEST);
-		sectors_detect_xrc.frustum_query(rmPortals,*_frustum);
+		sectors_detect_xrc.frustum_query(portals_cform, *_frustum);
 		for (int K=0; K< sectors_detect_xrc.r_count(); K++)
 		{
-			CPortal* pPortal = (CPortal*) Portals[rmPortals->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];
+			CPortal* pPortal = (CPortal*)RImplementation.Portals[portals_cform->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];
 
 			if(!pPortal)
 				continue;
@@ -194,5 +196,4 @@ xr_vector<IRender_Sector*> CRender::detectSectors_frustum(CSector* sector, CFrus
 				m_sectors.push_back(pBack);
 		}
 	}
-	return m_sectors;
 }
diff --git a/src/Layers/xrRenderPC_R1/FStaticRender.h b/src/Layers/xrRenderPC_R1/FStaticRender.h
@@ -150,8 +150,6 @@ class CRender													:	public R_dsgraph_structure
 	virtual IRender_Sector*			detectSector			(const Fvector& P);
 	IRender_Sector*					detectLastSector		(const Fvector& P);
 	IRender_Sector*					detectSector			(const Fvector& P, Fvector& D);
-	xr_vector<IRender_Sector*>		detectSectors_sphere	(CSector* sector, const Fvector& b_center, const Fvector& b_dim);
-	xr_vector<IRender_Sector*>		detectSectors_frustum	(CSector* sector, CFrustum* _frustum);
 	int								translateSector			(IRender_Sector* pSector);
 	virtual IRender_Target*			getTarget				();
 	virtual SurfaceParams getSurface(const char* nameTexture) override;
diff --git a/src/Layers/xrRenderPC_R2/r2.h b/src/Layers/xrRenderPC_R2/r2.h
@@ -163,8 +163,6 @@ class CRender													:	public R_dsgraph_structure
 	IRenderVisual*					model_CreatePE				(LPCSTR name);
 	IRender_Sector*					detectSector				(const Fvector& P, Fvector& D);
 	IRender_Sector*					detectLastSector			(const Fvector& P);
-	xr_vector<IRender_Sector*>		detectSectors_sphere		(CSector* sector, const Fvector& b_center, const Fvector& b_dim);
-	xr_vector<IRender_Sector*>		detectSectors_frustum		(CSector* sector, CFrustum* _frustum);
 	int								translateSector				(IRender_Sector* pSector);
 	virtual SurfaceParams getSurface(const char* nameTexture) override;
 
diff --git a/src/Layers/xrRenderPC_R4/r4.h b/src/Layers/xrRenderPC_R4/r4.h
@@ -27,13 +27,7 @@ class dxRender_Visual;
 class CRender	:	public R_dsgraph_structure
 {
 public:
-	enum
-	{
-		PHASE_NORMAL	= 0,	// E[0]
-		PHASE_SMAP		= 1,	// E[1]
-		PHASE_REFLECT	= 2,
-	};
-	
+
 	enum
 	{
 		MMSM_OFF = 0,
@@ -255,8 +249,6 @@ class CRender	:	public R_dsgraph_structure
 	virtual IRender_Sector*			getSector					(int id);
 	virtual IRenderVisual*			getVisual					(int id);
 	virtual IRender_Sector*			detectSector				(const Fvector& P);
-	xr_vector<IRender_Sector*>		detectSectors_sphere		(CSector* sector, const Fvector& b_center, const Fvector& b_dim);
-	xr_vector<IRender_Sector*>		detectSectors_frustum		(CSector* sector, CFrustum* _frustum);
 	virtual IRender_Target*			getTarget					();
 
 	// Main 
diff --git a/src/xrEngine/Render.h b/src/xrEngine/Render.h
@@ -192,11 +192,18 @@ class	ENGINE_API	IRender_interface
 		SM_FOR_MPSENDING			= 4,
 		SM_forcedword				= u32(-1)
 	};
+	enum
+	{
+		PHASE_NORMAL = 0,	// E[0]
+		PHASE_SMAP = 1,	// E[1]
+		PHASE_REFLECT = 2,
+	};
 public:
 
 	// data
 	CFrustum						ViewBase;
 	CFrustum*						View;
+	u32								phase;
 public:
 	// feature level
 	virtual	GenerationLevel			get_generation			()											= 0;

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ void light::set_rotation (const Fvector& D, const Fvector& R) {`
`196`	`196`	`#if RENDER!=R_R1`
`197`	`197`	`void light::get_sectors()`
`198`	`198`	`{`
`199`		`- if(RImplementation.SectorsCount()<=1) return;`
	`199`	`+ if(RImplementation.SectorsCount()<=1 \|\| SpatialComponent.get() == nullptr) return;`
`200`	`200`	`xrCriticalSectionGuard guard(&sectors_lc);`
`201`	`201`	`if(0== SpatialComponent->spatial.sector)`
`202`	`202`	`SpatialComponent->spatial_updatesector();`
`@@ -206,14 +206,14 @@ void light::get_sectors()`
`206`	`206`
`207`	`207`	`if(flags.type == IRender_Light::SPOT \|\| flags.type == IRender_Light::OMNIPART)`
`208`	`208`	`{`
`209`		`- CFrustum temp = CFrustum();`
`210`		`- temp.CreateFromMatrix (X.S.combine, FRUSTUM_P_ALL);`
	`209`	`+ CFrustum temp;`
	`210`	`+ temp.CreateFromMatrix(X.S.combine, FRUSTUM_P_ALL);`
`211`	`211`
`212`		`- m_sectors = std::move(RImplementation.detectSectors_frustum(sector, &temp));`
	`212`	`+ RImplementation.detectSectors_frustum(sector, m_sectors, &temp);`
`213`	`213`	`}`
`214`		`- if(flags.type == IRender_Light::POINT)`
	`214`	`+ else if(flags.type == IRender_Light::POINT)`
`215`	`215`	`{`
`216`		`- m_sectors = std::move(RImplementation.detectSectors_sphere(sector, position, Fvector().set(range, range, range)));`
	`216`	`+ RImplementation.detectSectors_sphere(sector, m_sectors, { position, range });`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`@@ -223,6 +223,9 @@ bool light::has_light_visible_from_sectors()`
`223`	`223`	`xrCriticalSectionGuard guard(&sectors_lc);`
`224`	`224`	`for (IRender_Sector* IRsector : m_sectors)`
`225`	`225`	`{`
	`226`	`+ if (IRsector == nullptr)`
	`227`	`+ continue;`
	`228`	`+`
`226`	`229`	`CSector* sector_ = (CSector*)IRsector;`
`227`	`230`	`if (sector_ != nullptr && PortalTraverser.i_marker == sector_->r_marker)`
`228`	`231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -141,17 +141,19 @@ IRender_Sector* CRender::detectSector(const Fvector& P, Fvector& dir)`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`-xr_vector<IRender_Sector> CRender::detectSectors_sphere(CSector sector, const Fvector& b_center, const Fvector& b_dim)`
	`144`	`+void R_dsgraph_structure::detectSectors_sphere(CSector* sector, xr_vector<IRender_Sector*>& m_sectors, const Fsphere& sphere)`
`145`	`145`	`{`
`146`		`- xr_vector<IRender_Sector*> m_sectors;`
`147`		`- m_sectors.push_back(sector);`
`148`		`- if (rmPortals)`
	`146`	`+ if(sector)`
	`147`	`+ m_sectors.push_back(sector);`
	`148`	`+`
	`149`	`+ if (CDB::MODEL* portals_cform = RImplementation.rmPortals)`
`149`	`150`	`{`
`150`	`151`	`sectors_detect_xrc.box_options(CDB::OPT_FULL_TEST);`
`151`		`- sectors_detect_xrc.box_query(rmPortals,b_center,b_dim);`
	`152`	`+ float sphere_r = sphere.R;`
	`153`	`+ sectors_detect_xrc.box_query(portals_cform, sphere.P, { sphere_r, sphere_r, sphere_r });`
`152`	`154`	`for (int K=0; K< sectors_detect_xrc.r_count(); K++)`
`153`	`155`	`{`
`154`		`- CPortal* pPortal = (CPortal*) Portals[rmPortals->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];`
	`156`	`+ CPortal* pPortal = (CPortal*)RImplementation.Portals[portals_cform->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];`
`155`	`157`
`156`	`158`	`if(!pPortal)`
`157`	`159`	`continue;`
`@@ -166,20 +168,20 @@ xr_vector<IRender_Sector> CRender::detectSectors_sphere(CSector sector, const`
`166`	`168`	`m_sectors.push_back(pBack);`
`167`	`169`	`}`
`168`	`170`	`}`
`169`		`- return m_sectors;`
`170`	`171`	`}`
`171`	`172`
`172`		`-xr_vector<IRender_Sector> CRender::detectSectors_frustum(CSector sector, CFrustum* _frustum)`
	`173`	`+void R_dsgraph_structure::detectSectors_frustum(CSector* sector, xr_vector<IRender_Sector>& m_sectors, CFrustum _frustum)`
`173`	`174`	`{`
`174`		`- xr_vector<IRender_Sector*> m_sectors;`
`175`		`- m_sectors.push_back(sector);`
`176`		`- if (rmPortals)`
	`175`	`+ if(sector)`
	`176`	`+ m_sectors.push_back(sector);`
	`177`	`+`
	`178`	`+ if (CDB::MODEL* portals_cform = RImplementation.rmPortals)`
`177`	`179`	`{`
`178`	`180`	`sectors_detect_xrc.frustum_options(CDB::OPT_FULL_TEST);`
`179`		`- sectors_detect_xrc.frustum_query(rmPortals,*_frustum);`
	`181`	`+ sectors_detect_xrc.frustum_query(portals_cform, *_frustum);`
`180`	`182`	`for (int K=0; K< sectors_detect_xrc.r_count(); K++)`
`181`	`183`	`{`
`182`		`- CPortal* pPortal = (CPortal*) Portals[rmPortals->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];`
	`184`	`+ CPortal* pPortal = (CPortal*)RImplementation.Portals[portals_cform->get_tris()[sectors_detect_xrc.r_begin()[K].id].dummy];`
`183`	`185`
`184`	`186`	`if(!pPortal)`
`185`	`187`	`continue;`
`@@ -194,5 +196,4 @@ xr_vector<IRender_Sector> CRender::detectSectors_frustum(CSector sector, CFrus`
`194`	`196`	`m_sectors.push_back(pBack);`
`195`	`197`	`}`
`196`	`198`	`}`
`197`		`- return m_sectors;`
`198`	`199`	`}`