CFrom -> CForm (fixed typo)

ixray-team · Nov 17, 2024 · 6e7b6c5 · 6e7b6c5
1 parent 8223501
commit 6e7b6c5
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/...LevelEditor/Editor/Scene/CFromBuilder.cpp → ...LevelEditor/Editor/Scene/CFormBuilder.cpp b/...LevelEditor/Editor/Scene/CFromBuilder.cpp → ...LevelEditor/Editor/Scene/CFormBuilder.cpp
@@ -3,16 +3,16 @@
 #include "../../xrphysics/iphworld.h"
 #include "../../xrcdb/xr_area.h"
 
-CFromBuilder::CFromBuilder()
+CFormBuilder::CFormBuilder()
 {
 	m_Box.invalidate();
 }
 
-CFromBuilder::~CFromBuilder()
+CFormBuilder::~CFormBuilder()
 {
 }
 
-bool CFromBuilder::build()
+bool CFormBuilder::build()
 {
 	clear();
 	auto GetBox = [](Fbox& box, const Fvector* verts, u32 cnt)
@@ -69,19 +69,19 @@ bool CFromBuilder::build()
 	return true;
 }
 
-bool CFromBuilder::empty() const
+bool CFormBuilder::empty() const
 {
     return m_Faces.empty();
 }
 
-void CFromBuilder::clear()
+void CFormBuilder::clear()
 {
 	m_Box.invalidate();
 	m_Vertex.clear();
 	m_Faces.clear();
 }
 
-void CFromBuilder::Load(CObjectSpace* To, CDB::build_callback cb)
+void CFormBuilder::Load(CObjectSpace* To, CDB::build_callback cb)
 {
 	hdrCFORM H = {};
 	H.vertcount = m_Vertex.size();

diff --git a/...s/LevelEditor/Editor/Scene/CFromBuilder.h → ...s/LevelEditor/Editor/Scene/CFormBuilder.h b/...s/LevelEditor/Editor/Scene/CFromBuilder.h → ...s/LevelEditor/Editor/Scene/CFormBuilder.h
@@ -1,9 +1,9 @@
 #pragma once
-class CFromBuilder
+class CFormBuilder
 {
 public:
-	CFromBuilder();
-	virtual			~CFromBuilder();
+	CFormBuilder();
+	virtual			~CFormBuilder();
 	bool build();
 	bool empty()const;
 	void clear();

diff --git a/src/Editors/LevelEditor/Editor/Scene/LEPhysics.cpp b/src/Editors/LevelEditor/Editor/Scene/LEPhysics.cpp
@@ -186,7 +186,7 @@ void CScenePhyscs::DestroyObjectSpace	()
 
   }
 
- void CScenePhyscs::GenerateCFrom(CObjectSpace* To, CDB::build_callback cb)
+ void CScenePhyscs::GenerateCForm(CObjectSpace* To, CDB::build_callback cb)
  {
 
      bool bResult = true;

diff --git a/src/Editors/LevelEditor/Editor/Scene/LEPhysics.h b/src/Editors/LevelEditor/Editor/Scene/LEPhysics.h
@@ -11,7 +11,7 @@ class CScenePhyscs
  	CScenePhyscs			() : m_object_space(0), b_update_level_collision(false)	{}
 	~CScenePhyscs			() ;
  public:
-     void	GenerateCFrom(CObjectSpace*To, CDB::build_callback cb);
+     void	GenerateCForm(CObjectSpace*To, CDB::build_callback cb);
     void	CreateWorld			();
     void 	DestroyWorld		();
     void	CreateShellsSelected();

diff --git a/src/Editors/LevelEditor/Editor/Scene/scene.cpp b/src/Editors/LevelEditor/Editor/Scene/scene.cpp
@@ -305,7 +305,7 @@ void EScene::Clear(BOOL bEditableToolsOnly)
 	m_CreateTime = time(NULL);
 
 	m_SaveCache.free();
-	m_cfrom_builder.clear();
+	m_cform_builder.clear();
 	m_level_graph.clear();
 	m_game_graph.clear();
 	m_RTFlags.set(flIsBuildedAIMap | flIsBuildedGameGraph | flIsBuildedCForm, FALSE);
@@ -752,9 +752,9 @@ void EScene::Stop()
 	g_pGamePersistent->Environment().Invalidate();
 }
 
-void EScene::LoadCFrom(CObjectSpace* Space, CDB::build_callback cb)
+void EScene::LoadCForm(CObjectSpace* Space, CDB::build_callback cb)
 {
-	m_cfrom_builder.Load(Space, cb);
+	m_cform_builder.Load(Space, cb);
 }
 
 IReader* EScene::LoadSpawn()
@@ -819,7 +819,7 @@ bool EScene::BuildCForm()
 {
 	if (!m_RTFlags.is(flIsBuildedCForm))
 	{
-		if (!m_cfrom_builder.build())
+		if (!m_cform_builder.build())
 		{
 			Msg("! CForm is empty!");
 			return false;

diff --git a/src/Editors/LevelEditor/Editor/Scene/scene.h b/src/Editors/LevelEditor/Editor/Scene/scene.h
@@ -327,7 +327,7 @@ class EScene :public XrEditorSceneInterface
 	bool IsPlayInEditor();
 	virtual void Stop();
 
-	virtual	void LoadCFrom(CObjectSpace* Space, CDB::build_callback cb);
+	virtual	void LoadCForm(CObjectSpace* Space, CDB::build_callback cb);
 	virtual IReader* LoadSpawn();
 	virtual IGameGraph* GetGameGraph();
 	virtual ILevelGraph* GetLevelGraph();
@@ -356,7 +356,7 @@ class EScene :public XrEditorSceneInterface
 	CMemoryWriter	m_spawn_data;
 
 	CGameGraphBuilder m_graph_builder;
-	CFromBuilder m_cfrom_builder;
+	CFormBuilder m_cform_builder;
 };
 
 

diff --git a/src/Editors/LevelEditor/Editor/Scene/scene_spawn.cpp b/src/Editors/LevelEditor/Editor/Scene/scene_spawn.cpp
@@ -3,7 +3,7 @@
 
 bool EScene::BuildSpawn()
 {
-	if (m_cfrom_builder.empty())
+	if (m_cform_builder.empty())
 	{
 		if (!BuildCForm())
 		{
@@ -62,7 +62,7 @@ bool EScene::BuildForPCPlay()
 		return false;
 	}
 
-	if (m_cfrom_builder.empty())
+	if (m_cform_builder.empty())
 	{
 		if (!BuildCForm())
 		{

diff --git a/src/Editors/LevelEditor/stdafx.h b/src/Editors/LevelEditor/stdafx.h
@@ -142,7 +142,7 @@
 #include "Editor/Tools/WayPoint/ESceneWayControls.h"
 #include "Editor/Tools/Glow/ESceneGlowTools.h"
 
-#include "Editor/Scene/CFromBuilder.h"
+#include "Editor/Scene/CFormBuilder.h"
 #include "Editor/Scene/scene.h"
 #include "Editor/Scene/SceneGraph.h"
 #include "Editor/Scene/SceneSummaryInfo.h"

diff --git a/src/xrEngine/Editor/XrEditorSceneInterface.h b/src/xrEngine/Editor/XrEditorSceneInterface.h
@@ -6,7 +6,7 @@ class XrEditorSceneInterface
 {
 public:
 	virtual IReader* LoadSpawn() = 0;
-	virtual	void LoadCFrom(CObjectSpace*Space, CDB::build_callback)=0;
+	virtual	void LoadCForm(CObjectSpace*Space, CDB::build_callback)=0;
 	virtual class IGameGraph* GetGameGraph() = 0;
 	virtual class ILevelGraph* GetLevelGraph() = 0;
 	virtual void Stop() = 0;

diff --git a/src/xrGame/EditorLevel.cpp b/src/xrGame/EditorLevel.cpp
@@ -91,7 +91,7 @@ BOOL CLevelEditor::net_Start(LPCSTR op_server, LPCSTR op_client)
 		Device.seqFrame.Add(this);
 		R_ASSERT(Load_GameSpecific_Before());
 		Objects.Load();
-		EditorScene->LoadCFrom(&ObjectSpace, build_callback);
+		EditorScene->LoadCForm(&ObjectSpace, build_callback);
 		bReady = true;
 		map_data.m_level_geom_crc32 = 0;
 	}