Fix build

ixray-team · Sep 25, 2024 · ddeead6 · ddeead6
1 parent e0b5393
commit ddeead6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp
@@ -93,12 +93,8 @@ float		ps_r__WallmarkTTL			= 50.f	;
 float		ps_r__WallmarkSHIFT			= 0.0001f;
 float		ps_r__WallmarkSHIFT_V		= 0.0001f;
 
-float		ps_r__GLOD_ssa_start		= 256.f	;
-float		ps_r__GLOD_ssa_end			=  64.f	;
 float		ps_r__LOD					=  0.75f	;
-float		ps_r__ssaDISCARD			=  3.5f	;					//RO
 float		ps_r__ssaDONTSORT			=  32.f	;					//RO
-float		ps_r__ssaHZBvsTEX			=  96.f	;					//RO
 // Base factor values
 float		ps_r__GLOD_ssa_start = 256.f;
 float		ps_r__GLOD_ssa_end = 64.f;

diff --git a/src/xrCore/XmlParser/xrXMLParser.cpp b/src/xrCore/XmlParser/xrXMLParser.cpp
@@ -66,7 +66,7 @@ bool CXml::Load(LPCSTR path_alias, LPCSTR path, LPCSTR _xml_filename)
 }
 
 //инициализациѝ и загрузка XML файла
-void CXml::Load(LPCSTR path, LPCSTR xml_filename)
+bool CXml::Load(LPCSTR path, LPCSTR xml_filename)
 {
 	xr_strcpy(m_xml_file_name, xml_filename);
 	// Load and parse xml file

diff --git a/src/xrEngine/Render.h b/src/xrEngine/Render.h
@@ -234,12 +234,6 @@ class	ENGINE_API	IRender_interface
 	//	Prefer this function when possible
 	virtual void					add_SkeletonWallmark	(const Fmatrix* xf, IKinematics* obj, IWallMarkArray *pArray, const Fvector& start, const Fvector& dir, float size)=0;
 
-	//	Prefer this function when possible
-	virtual void					add_StaticWallmark		(IWallMarkArray *pArray, const Fvector& P, float s, CDB::TRI* T, Fvector* V) {};
-	virtual void					clear_static_wallmarks	() {};
-
-	//	Prefer this function when possible
-	virtual void					add_SkeletonWallmark	(const Fmatrix* xf, IKinematics* obj, IWallMarkArray *pArray, const Fvector& start, const Fvector& dir, float size) {};
 
 	virtual IRender_ObjectSpecific*	ros_create				(IRenderable* parent)						{ return 0; };
 	virtual void					ros_destroy				(IRender_ObjectSpecific* &)					{};

diff --git a/src/xrGame/UI3dStatic.h b/src/xrGame/UI3dStatic.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "UIWindow.h"
+#include "UIStatic.h"
 #include "../../Include/xrRender/RenderVisual.h"
 #include "../../Include/xrRender/Kinematics.h"
 
@@ -23,14 +24,14 @@ class CUI3dStatic : public CUIStatic
 
     void SetVisual(IRenderVisual* pVisual);
 
-    //ïðîðèñîâêà îêíà
+    //прорисовка окна
     virtual void Draw();
 
 protected:
     float m_x_angle, m_y_angle, m_z_angle;
     float dist, viewport_near;
-    //ïåðåâîä èç êîîðäèíàò ýêðàíà â êîîðäèíàòû òîé ïëîñêîñòè
-    //ãäå íàõîäèòüñÿ îáúåêò
+    //перевод из координат экрана в координаты той плоскости
+    //где находиться объект
     void FromScreenToItem(int x_screen, int y_screen, float& x_item, float& y_item);
 
     IRenderVisual* m_pCurrentItem;