View difference between Paste ID: ieyh8CRT and 8jG62xX7

 Index: scenes/object-statistics.cpp
 ===================================================================
---- scenes/object-statistics.cpp	(revision 0)
+--- scenes/object-statistics.cpp	(revision 6693)
 +++ scenes/object-statistics.cpp	(working copy)
-@@ -0,0 +1,59 @@
+@@ -5,6 +5,39 @@
-+#include "edterrain_utils.h"
+
  REGISTER_FUNCTION_OPERATION("object-statistics", buildObjectStatisticsOperation, "");
-+#include "edterrain4/landscape4/lReferenceFile.h"
+
-+#include "edterrain4/landscape5/scene5file.h"
++ struct ReferenceStatistics
 + {
-+REGISTER_FUNCTION_OPERATION("object-statistics", buildObjectStatisticsOperation, "");
++	  unsigned referenceUsage;
 +
-+void buildObjectStatisticsOperation(const ed::ConsoleArgs& args)
++	  ReferenceStatistics() : referenceUsage(0) {}
-+{
+
-+	ed::string configFileName = args["-terrain"];
++	  bool unused() const
-+	if (configFileName == "")
++	  {
-+		throw "Couldn't find \"-terrain\" console argument!";
++		  return referenceUsage == 0;
 +	  }
-+	auto *terraDispatch = landscape4::CreateTerraDispatch();
++ };
-+	if (!landscape4::GetTerraDispatch()->openTerrain(configFileName.c_str()))
+
-+		throw "Failed to load terrain \"" + configFileName + "\"";
++ struct ReferenceFileStatistics
 + {
-+	landscape4::GetTerraDispatch()->init("references");
++	  mutable ed::map<const ed::string, ReferenceStatistics> referencesStatistics;
-+	landscape4::GetTerraDispatch()->init("scene");
++	  ed::set<ed::string> referencesNames;
 +
-+	auto const& referenceFiles = terraDispatch->getReferenceFile();
++	  void addReference(const ed::string& referenceName)
-+	auto const& scenes = terraDispatch->getScene();
++	  {
-+	auto const& sceneModels = scenes.building_types;
++		  referencesNames.insert(referenceName);
-+	ed::map<ed::string, size_t> referencesUsage;
++	  }
-+	ed::set<ed::string> referencesNames;
+
 +	  void incrementReferenceUsage(const ed::string& referenceName)
-+	for (auto const& referenceFile : referenceFiles)
++	  {
-+	{
++		  referencesStatistics[referenceName].referenceUsage++;
-+		auto const& references = referenceFile.references;
++	  }
-+		for (auto const& reference : references)
+
-+		{
++	  bool unused(const ed::string& referenceName) const
-+			for (auto const& modelName : sceneModels)
++	  {
 +		  return referencesStatistics[referenceName].unused();
-+				referencesNames.insert(reference.name);
++	  }
-+				if (modelName == reference.name)
++ };
-+					referencesUsage[modelName]++;
+
  void buildObjectStatisticsOperation(const ed::ConsoleArgs& args)
-+		}
+ {
-+	}
+ 	ed::string configFileName = args["-terrain"];
 @@ -21,7 +54,7 @@
-+	bool unusedExists = false;
+ 	const auto& referenceFiles = terraDispatch->getReferenceFile();
-+	for (auto const& referenceName : referencesNames)
+ 	const auto& scenes = terraDispatch->getScene();
-+	{
+ 	const auto& sceneModels = scenes.building_types;
-+		if (referencesUsage[referenceName] == 0)
+-	ed::map<ed::string, ed::map<ed::string, unsigned>> referencesUsage;
-+		{
++	ed::map<ed::string, ReferenceFileStatistics> referencesStatistics;
-+			if (!unusedExists)
+
  	for (const auto& referenceFile : referenceFiles)
-+				std::cout << std::colorRed << "Unused references:\n";
+ 	{
-+				unusedExists = true;
+@@ -28,27 +61,39 @@
  		const auto& references = referenceFile.references;
-+			std::cout << std::colorRed << referenceName << "\n";
+ 		for (const auto& reference : references)
-+		}
+ 		{
-+	}
++			referencesStatistics[referenceFile.getName()].addReference(reference.name);
  			for (const auto& modelName : sceneModels)
-+	if (!unusedExists)
+ 			{
-+		std::cout << std::colorGreen << "All references are used\n";
+ 				if (modelName == reference.name)
 -					referencesUsage[referenceFile.getName()][reference.name]++;
-+	std::cout << std::colorWhite;
++					referencesStatistics[referenceFile.getName()].incrementReferenceUsage(reference.name);
-+}
+ 			}
-\ No newline at end of file
+ 		}
  	}
 
  	bool unusedExists = false;
 -	for (const auto& referenceFile : referencesUsage)
 +	for (const auto& referenceFileStatisticsIterator : referencesStatistics)
  	{
 -		if (!unusedExists)
 +		bool hasUnused = false;
 +		const auto& referenceFileStatistics = referenceFileStatisticsIterator.second;
 +		for (const auto& referenceName : referenceFileStatistics.referencesNames)
  		{
 -			std::cout << std::colorRed << "Unused references:\n";
 -			unusedExists = true;
 +			if (referenceFileStatistics.unused(referenceName))
 +			{
 +				if (!unusedExists)
 +				{
 +					std::cout << std::colorRed << "Unused references:\n\n";
 +					unusedExists = true;
 +				}
 +				if (!hasUnused)
 +				{
 +					std::cout << std::colorWhite << referenceFileStatisticsIterator.first << ":\n";
 +					hasUnused = true;
 +				}
 +				std::cout << std::colorRed << referenceName << "\n";
 +			}
  		}
 -		std::cout << std::colorWhite << "\n" << referenceFile.first << ":\n";
 -		for (const auto& unusedReference : referencesUsage[referenceFile.first])
 -		{
 -			std::cout << std::colorRed << unusedReference.first << "\n";
 -		}
 +		if (hasUnused)
 +			std::cout << "\n";
  	}
 
  	if (!unusedExists)