Support for 64-bit integers (for chunk files); std::numeric_limits in…

…stead of constants in writer; removed VS project files - use CMake for solution generation
hedger · Mar 4, 2014 · 3f825b4 · 3f825b4
1 parent 23c34ea
commit 3f825b4
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 232 deletions.
diff --git a/BWXML.sln b/BWXML.sln
diff --git a/BWXML/BW.hpp b/BWXML/BW.hpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ namespace BigWorld
 	};
 
 #pragma pack(push, 1)
+	// FIXME: use union?
 	class DataDescriptor
 	{
 		unsigned int __raw;

diff --git a/BWXML/BWCommon.cpp b/BWXML/BWCommon.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,31 +28,33 @@ namespace BWPack
 	using namespace BigWorld;
 	using namespace IO;
 
-	static std::string serializeF(std::vector<float> floatVals)
+	static std::string serializeF(const std::vector<float>& floatVals)
 	{
 		std::stringstream _ret;
 		StreamBufWriter ret(_ret.rdbuf());
 		std::for_each(floatVals.begin(), floatVals.end(), [&](float v){ ret.put<float>(v); });
 		return _ret.str();
 	}
 
-	static std::string serializeI(int intVal)
+	static std::string serializeI(const long long& intVal)
 	{
 		std::stringstream _ret;
 		StreamBufWriter ret(_ret.rdbuf());
 
-		unsigned int absVal = abs(intVal);
-		if (absVal > 0x7FFF)
-			ret.put<int>(intVal);
-		else if (absVal > 0x7F)
+		unsigned long long absVal = abs(intVal);
+		if (absVal > std::numeric_limits<long>::max())
+			ret.put<long long>(intVal);
+		else if (absVal > std::numeric_limits<short>::max())
+			ret.put<int>(static_cast<int>(intVal));
+		else if (absVal > std::numeric_limits<char>::max())
 			ret.put<short>(static_cast<short>(intVal));
 		else if (absVal != 0)
 			ret.put<char>(static_cast<char>(intVal));
 
 		return _ret.str();
 	}
 
-	static std::string serializeB(bool boolVal)
+	static std::string serializeB(const bool boolVal)
 	{
 		std::stringstream _ret;
 		StreamBufWriter ret(_ret.rdbuf());
@@ -96,7 +98,7 @@ namespace BWPack
 		{
 			std::stringstream ss;
 			ss << strVal;
-			int i;
+			long long i;
 			ss >> i;
 			if (!ss.fail() && ss.eof())
 				return rawDataBlock(BW_Int, serializeI(i));

diff --git a/BWXML/BWCommon.h b/BWXML/BWCommon.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/BWReader.cpp b/BWXML/BWReader.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -78,6 +78,9 @@ namespace BWPack
 		case BW_Int:
 			switch (var_size)
 			{
+			case 8:
+				current_node.put_value(mStream.get<long long>());
+				break;
 			case 4:
 				current_node.put_value(mStream.get<int>());
 				break;

diff --git a/BWXML/BWReader.h b/BWXML/BWReader.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/BWWriter.cpp b/BWXML/BWWriter.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/BWWriter.h b/BWXML/BWWriter.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/BWXML.vcxproj b/BWXML/BWXML.vcxproj
diff --git a/BWXML/BWXML.vcxproj.filters b/BWXML/BWXML.vcxproj.filters
diff --git a/BWXML/Base64.cpp b/BWXML/Base64.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/Base64.h b/BWXML/Base64.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/DataStream.cpp b/BWXML/DataStream.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/DataStream.h b/BWXML/DataStream.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/BWXML/main.cpp b/BWXML/main.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright 2013 hedger
+Copyright 2013-2014 hedger
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@ int main(int argc, char* argv[])
 
 	bpo::variables_map vm;
 
-	std::cout << "BWXML v1.01 by hedger" << std::endl;
+	std::cout << "BWXML v1.02 by hedger" << std::endl;
 
 	try
 	{

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,7 +26,8 @@ aux_source_directory(BWXML SOURCES)
 link_directories(${Boost_LIBRARY_DIRS})
 include_directories(BWXML ${Boost_INCLUDE_DIRS})
 
-add_executable(bwxml ${SOURCES})
+file (GLOB headers BWXML/*.h*)
+add_executable(bwxml ${SOURCES} ${headers})
 target_link_libraries(bwxml ${Boost_LIBRARIES})
 
 #

diff --git a/make_vs_solution.bat b/make_vs_solution.bat
@@ -0,0 +1,4 @@
+mkdir build
+cd build
+cmake -G "Visual Studio 11" ..
+BWXML.sln