Merge from dev [skip ci]

Author: xrSimpodin

ogsr_engine/xrGame/ui_defs.h

@@ -5,43 +5,3 @@
 #include "../Include/xrRender/UIShader.h"
 
 typedef	FactoryPtr<IUIShader> ui_shader;
-
-/*
-#define UI_BASE_WIDTH	1024.0f
-#define UI_BASE_HEIGHT	768.0f
-
-enum EUIItemAlign{
-	alNone	= 0x0000,
-	alLeft	= 0x0001,
-	alRight	= 0x0002,
-	alTop	= 0x0004,
-	alBottom= 0x0008,
-	alCenter= 0x0010
-};
-
-struct S2DVert
-{
-	Fvector2	pt;
-	Fvector2	uv;
-				S2DVert		(){}
-				S2DVert		(float pX, float pY, float tU, float tV){pt.set(pX,pY);uv.set(tU,tV);}
-	void		set			(float pt_x, float pt_y, float uv_x, float uv_y){pt.set(pt_x,pt_y);uv.set(uv_x,uv_y);}
-	void		set			(const Fvector2& _pt, const Fvector2& _uv){pt.set(_pt);uv.set(_uv);}
-	void		rotate_pt	(const Fvector2& pivot, const float cosA, const float sinA, const float kx);
-};
-
-#define UI_FRUSTUM_MAXPLANES	12
-#define UI_FRUSTUM_SAFE			(UI_FRUSTUM_MAXPLANES*4)
-typedef svector<S2DVert,UI_FRUSTUM_SAFE>		sPoly2D;
-
-class C2DFrustum
-{
-	svector<Fplane2,FRUSTUM_MAXPLANES> planes;
-	Frect						m_rect;
-public:
-	void		CreateFromRect	(const Frect& rect);
-	sPoly2D*	ClipPoly		(sPoly2D& S, sPoly2D& D) const;
-};
-
-extern ENGINE_API BOOL g_bRendering; 
-*/

ogsr_engine/xr_3da/CameraManager.h

@@ -7,7 +7,7 @@ struct ENGINE_API SPPInfo
 	struct SColor
 	{
 		float r, g, b;
-		SColor() = default;
+		SColor() {};
 		SColor(float _r, float _g, float _b) : r(_r), g(_g), b(_b) {}
 		IC operator u32()
 		{
@@ -44,7 +44,7 @@ struct ENGINE_API SPPInfo
 	struct SDuality
 	{
 		float h, v;
-		SDuality() = default;
+		SDuality() {};
 		SDuality(float _h, float _v) : h(_h), v(_v) {}
 		IC SDuality& set(float _h, float _v)
 		{
@@ -57,7 +57,7 @@ struct ENGINE_API SPPInfo
 	{
 		float intensity, grain;
 		float fps;
-		SNoise() = default;
+		SNoise() {};
 		SNoise(float _i, float _g, float _f) : intensity(_i), grain(_g), fps(_f) {}
 		IC SNoise& set(float _i, float _g, float _f)
 		{